diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2018-07-19 13:08:17 +0000 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2018-07-19 15:22:29 +0000 |
| commit | c6f9a9b8468b3746a3dec7ee2a0b7d84ec9fb44a (patch) | |
| tree | e766e0b4b1bb894c5511ed6d1e71a4ac389415d6 /src/CMakeLists.txt | |
| parent | e4222ca8da3b02afca5625fa2cef6832aa8ce90e (diff) | |
Revert "Add PolicyManager as plugin"
This reverts commit 99b6f4d2fcd421d3a760a88a67e511fb6fc98068.
Change-Id: I8725ca05a3e3fa0ea9e1db935e9e7d5b85a9affd
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6155ef3..ee398e0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -38,23 +38,20 @@ add_library(${TARGETS_WM} MODULE wm_error.cpp wm_config.cpp applist.cpp - request.cpp - pm_wrapper.cpp) + request.cpp) target_include_directories(${TARGETS_WM} PRIVATE ${AFB_INCLUDE_DIRS} ${SD_INCLUDE_DIRS} ../include - ../src - ../src/${PLUGIN_PM}) + ../src) target_link_libraries(${TARGETS_WM} PRIVATE ${AFB_LIBRARIES} ${WLC_LIBRARIES} - ${SD_LIBRARIES} - ${CMAKE_BINARY_DIR}/src/${PLUGIN_PM}/lib${PLUGIN_PM}.so) + ${SD_LIBRARIES}) target_compile_definitions(${TARGETS_WM} PRIVATE @@ -86,12 +83,12 @@ set_target_properties(${TARGETS_WM} C_STANDARD 99 C_STANDARD_REQUIRED ON - LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/../export.map -Wl,-rpath,'$ORIGIN'") + LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/../export.map") if (LINK_LIBCXX) set_target_properties(${TARGETS_WM} PROPERTIES - LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/../export.map -lc++ -Wl,-rpath,'$ORIGIN'") + LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/../export.map -lc++") endif() if (NOT ${SANITIZER_MODE} STREQUAL "none" AND NOT ${SANITIZER_MODE} STREQUAL "") @@ -117,10 +114,6 @@ add_custom_command(TARGET ${TARGETS_WM} POST_BUILD COMMAND cp -f ${PROJECT_SOURCE_DIR}/src/db/old_roles.db ${PROJECT_BINARY_DIR}/package/root/etc COMMAND cp -f ${PROJECT_SOURCE_DIR}/src/db/areas.db ${PROJECT_BINARY_DIR}/package/root/etc COMMAND cp -f ${PROJECT_SOURCE_DIR}/conf/setting.json ${PROJECT_BINARY_DIR}/package/root/etc - COMMAND cp -f ${PROJECT_SOURCE_DIR}/src/${PLUGIN_PM}/db/layouts.db ${PROJECT_BINARY_DIR}/package/root/etc - COMMAND cp -f ${PROJECT_SOURCE_DIR}/src/${PLUGIN_PM}/db/roles.db ${PROJECT_BINARY_DIR}/package/root/etc - COMMAND cp -f ${PROJECT_BINARY_DIR}/src/${PLUGIN_PM}/lib${PLUGIN_PM}.so ${PROJECT_BINARY_DIR}/package/root/lib - COMMAND cp -f ${PROJECT_BINARY_DIR}/src/${PLUGIN_PM}/stm/${USE_STM_NAME}/src/libstm.so ${PROJECT_BINARY_DIR}/package/root/lib ) add_custom_target(package DEPENDS ${PROJECT_BINARY_DIR}/package/root |