1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
From: Shengjing Zhu <zhsj@debian.org>
Date: Mon, 11 Jan 2021 12:07:16 +0800
Subject: Use system cpu_features and sdbus-c++
Forwarded: not-needed
---
CMakeLists.txt | 3 +++
external/CMakeLists.txt | 10 ----------
src/CMakeLists.txt | 10 +++++-----
3 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c44854..f6ca4fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,6 +63,9 @@ find_package(EGL REQUIRED)
find_package(GLESv2 REQUIRED)
find_package(Protobuf REQUIRED)
+find_package(CpuFeatures REQUIRED)
+find_package(sdbus-c++ REQUIRED)
+
pkg_check_modules(SDL2 sdl2 REQUIRED)
pkg_check_modules(SDL2_IMAGE SDL2_image REQUIRED)
pkg_check_modules(DBUS dbus-1 REQUIRED)
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index f677aa0..b711e88 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -5,13 +5,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..4b539f4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -25,8 +25,8 @@ include_directories(
${CMAKE_BINARY_DIR}/external/android-emugl/host/libs/GLESv2_dec
${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
+ $<TARGET_PROPERTY:CpuFeatures::cpu_features,INTERFACE_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:SDBusCpp::sdbus-c++,INTERFACE_INCLUDE_DIRECTORIES>
)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBINDERFS_PATH=\"\\\"${BINDERFS_PATH}\\\"\"")
@@ -59,7 +59,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 /usr/bin/sdbus-c++-xml2cpp)
macro(DBusServer BaseName)
add_custom_command(
@@ -398,7 +398,7 @@ target_link_libraries(anbox-core
${MIRCLIENT_LIBRARIES}
${LIBSYSTEMD_LDFLAGS}
${LIBSYSTEMD_LIBRARIES}
- cpu_features
+ CpuFeatures::cpu_features
pthread
process-cpp
emugl_common
@@ -408,7 +408,7 @@ target_link_libraries(anbox-core
OpenGLESDispatch
OpenglCodecCommon
anbox-protobuf
- sdbus-c++
+ SDBusCpp::sdbus-c++
xdg)
link_directories(${CMAKE_CURRENT_BINARY_DIR}/../external/sdbus-cpp/src/sdbus-cpp-build/)
|
