From c24722a22144c071f8265a6c0ed95a328f871b7c Mon Sep 17 00:00:00 2001 From: Simon Fels Date: Tue, 5 Jul 2016 14:44:04 +0200 Subject: [PATCH] debian: get things building correctly --- debian/anbox.install | 2 -- debian/control | 1 + src/CMakeLists.txt | 11 ++++++----- 3 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 debian/anbox.install diff --git a/debian/anbox.install b/debian/anbox.install deleted file mode 100644 index 040ec15..0000000 --- a/debian/anbox.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin/anbox -usr/bin/anbox-container diff --git a/debian/control b/debian/control index 21f5beb..8e163cb 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Simon Fels Build-Depends: cmake, + cmake-data, debhelper (>= 9), dbus, google-mock, diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 44357bc..8c9dbc1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,6 +6,7 @@ include_directories( ${MIRCLIENT_INCLUDE_DIRS} ${DBUS_CPP_INCLUDE_DIRS} ${DBUS_INCLUDE_DIRS} + ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/external/process-cpp-minimal/include @@ -119,19 +120,19 @@ target_link_libraries(anbox-core ${DBUS_CPP_LIBRARIES} pthread process-cpp - OpenglRender) + OpenglRender + anbox-protobuf) add_executable(anbox main.cpp) target_link_libraries(anbox - anbox-core - anbox-protobuf) + anbox-core) add_executable(anbox-container container_main.cpp) target_link_libraries(anbox-container bwrap) install( - TARGETS anbox - RUNTIME DESTINATION sbin + TARGETS anbox anbox-container + RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib/static)