X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=ab0fd193e3e789086a921275b79f2c77253fe415;hb=5aab17cd6ef530e367559fa56fcdea3b48f60d54;hp=cc3efc327245e3c5d7a875ff172baefb03728aab;hpb=a94f6c67c67a68df8a894699686f2eaa8e870208;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cc3efc3..ab0fd19 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -25,14 +25,17 @@ set(CMAKE_SHARED_MODULE_PREFIX "")
 
 set(TARGETS_WM windowmanager-service)
 
+# Set use STM name
+set(USE_STM_NAME zipc)
+
 add_library(${TARGETS_WM} MODULE
    main.cpp
    wayland_ivi_wm.cpp
    wayland_ivi_wm.hpp
    util.cpp
    util.hpp
-   layout.cpp
-   layout.hpp
+   layout_manager/layout.cpp
+   layout_manager/layout.hpp
    ${IVI_CON_PROTO}
    json_helper.cpp
    json_helper.hpp
@@ -43,20 +46,28 @@ add_library(${TARGETS_WM} MODULE
    controller_hooks.hpp
    config.cpp
    config.hpp
-   policy.hpp)
+   low_can_client.cpp
+   low_can_client.hpp
+)
 
 target_include_directories(${TARGETS_WM}
     PRIVATE
         ${AFB_INCLUDE_DIRS}
         ${SD_INCLUDE_DIRS}
         ../include
-        ../src)
+        ../src
+        ../src/layout_manager
+        ../src/${PLUGIN_PM}
+        ../src/${PLUGIN_PM}/${USE_STM_NAME}
+)
 
 target_link_libraries(${TARGETS_WM}
     PRIVATE
         ${AFB_LIBRARIES}
         ${WLC_LIBRARIES}
-        ${SD_LIBRARIES})
+        ${SD_LIBRARIES}
+        ${CMAKE_BINARY_DIR}/src/${PLUGIN_PM}/lib${PLUGIN_PM}.so
+)
 
 target_compile_definitions(${TARGETS_WM}
     PRIVATE
@@ -88,7 +99,7 @@ set_target_properties(${TARGETS_WM}
         C_STANDARD 99
         C_STANDARD_REQUIRED ON
 
-        LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/../export.map")
+        LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/../export.map -Wl,-rpath,'$ORIGIN'")
 
 if (LINK_LIBCXX)
    set_target_properties(${TARGETS_WM}
@@ -116,6 +127,10 @@ add_custom_command(TARGET ${TARGETS_WM} POST_BUILD
    COMMAND cp -rf ${PROJECT_BINARY_DIR}/src/${TARGETS_WM}.so ${PROJECT_BINARY_DIR}/package/root/lib
    COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/root/etc
    COMMAND cp -f ${PROJECT_SOURCE_DIR}/layers.json ${PROJECT_BINARY_DIR}/package/root/etc
+   COMMAND cp -f ${PROJECT_SOURCE_DIR}/src/layout_manager/db/layout.db ${PROJECT_BINARY_DIR}/package/root/etc
+   COMMAND cp -f ${PROJECT_SOURCE_DIR}/src/${PLUGIN_PM}/db/role.db ${PROJECT_BINARY_DIR}/package/root/etc
+   COMMAND cp -f ${PROJECT_SOURCE_DIR}/src/db/app.db ${PROJECT_BINARY_DIR}/package/root/etc
+   COMMAND cp -f ${PROJECT_BINARY_DIR}/src/policy_manager/libpolicy_manager.so ${PROJECT_BINARY_DIR}/package/root/lib
 )
 
 add_custom_target(package DEPENDS ${PROJECT_BINARY_DIR}/package/root