59 lines
2.1 KiB
Diff
59 lines
2.1 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 713df49..1e8b462 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -59,6 +59,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||
|
|
find_package(Boost COMPONENTS filesystem log serialization system thread program_options)
|
||
|
|
find_package(PkgConfig)
|
||
|
|
find_package(Threads)
|
||
|
|
+find_package(SDBus-C++ REQUIRED)
|
||
|
|
find_package(EGL REQUIRED)
|
||
|
|
find_package(GLESv2 REQUIRED)
|
||
|
|
find_package(Protobuf REQUIRED)
|
||
|
|
@@ -68,7 +69,6 @@ pkg_check_modules(SDL2_IMAGE SDL2_image REQUIRED)
|
||
|
|
pkg_check_modules(DBUS dbus-1 REQUIRED)
|
||
|
|
pkg_check_modules(LXC lxc REQUIRED)
|
||
|
|
pkg_check_modules(PROPERTIES_CPP properties-cpp REQUIRED)
|
||
|
|
-pkg_check_modules(LIBSYSTEMD libsystemd REQUIRED)
|
||
|
|
pkg_check_modules(LIBCAP libcap REQUIRED)
|
||
|
|
|
||
|
|
message(STATUS "LXC version: ${LXC_VERSION}")
|
||
|
|
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
|
||
|
|
index f677aa0..265a2eb 100644
|
||
|
|
--- a/external/CMakeLists.txt
|
||
|
|
+++ b/external/CMakeLists.txt
|
||
|
|
@@ -6,12 +6,3 @@ add_subdirectory(backward-cpp)
|
||
|
|
set(BUILD_TESTING OFF)
|
||
|
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error")
|
||
|
|
add_subdirectory(cpu_features)
|
||
|
|
-include(ExternalProject)
|
||
|
|
-ExternalProject_Add(sdbus-cpp
|
||
|
|
- PREFIX sdbus-cpp
|
||
|
|
- SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sdbus-cpp"
|
||
|
|
- INSTALL_COMMAND ""
|
||
|
|
- CMAKE_CACHE_ARGS
|
||
|
|
- -DBUILD_CODE_GEN:BOOL=ON
|
||
|
|
- -DBUILD_SHARED_LIBS:BOOL=OFF
|
||
|
|
-)
|
||
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||
|
|
index 796b881..a19da1b 100644
|
||
|
|
--- a/src/CMakeLists.txt
|
||
|
|
+++ b/src/CMakeLists.txt
|
||
|
|
@@ -26,7 +26,6 @@ include_directories(
|
||
|
|
${CMAKE_SOURCE_DIR}/external/android-emugl/host/libs/renderControl_dec
|
||
|
|
${CMAKE_BINARY_DIR}/external/android-emugl/host/libs/renderControl_dec
|
||
|
|
${CMAKE_SOURCE_DIR}/external/cpu_features/include
|
||
|
|
- ${CMAKE_SOURCE_DIR}/external/sdbus-cpp/include
|
||
|
|
)
|
||
|
|
|
||
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBINDERFS_PATH=\"\\\"${BINDERFS_PATH}\\\"\"")
|
||
|
|
@@ -59,7 +58,7 @@ add_library(anbox-protobuf
|
||
|
|
target_link_libraries(anbox-protobuf
|
||
|
|
${PROTOBUF_LITE_LIBRARIES})
|
||
|
|
|
||
|
|
-set(XML2CPP ${CMAKE_BINARY_DIR}/external/sdbus-cpp/src/sdbus-cpp-build/tools/sdbus-c++-xml2cpp)
|
||
|
|
+set(XML2CPP sdbus-c++-xml2cpp)
|
||
|
|
|
||
|
|
macro(DBusServer BaseName)
|
||
|
|
add_custom_command(
|