X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=98dc27cfa06a04acd3f1e0aae1e7bc19e97b7129;hb=9f2e628c47c9bb431b3833cd4dd47ddc588d056c;hp=5dcc0a5a7368ba882fa7ca03ab7284c9d0b78167;hpb=e0163d2b8daae98ced81f4bc737998c00858e771;p=apps%2Fagl-service-homescreen.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5dcc0a5..98dc27c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,52 +16,56 @@
 
 cmake_minimum_required(VERSION 2.8)
 
-set(TARGETS_SMBINDER homescreen-service)
+set(TARGETS_HSBINDER homescreen-service)
 
 INCLUDE(FindThreads)
 FIND_PACKAGE(Threads)
 
 pkg_check_modules(hs_binding_depends afb-daemon glib-2.0 gio-2.0 gio-unix-2.0 json-c)
 set(binding_hs_sources
-  homescreen.c
-  hs-helper.c)
+  homescreen.cpp
+  hs-helper.cpp
+  hs-clientmanager.cpp
+  hs-client.cpp
+  hs-proxy.cpp
+  hs-appinfo.cpp)
 
 link_libraries(-Wl,--as-needed -Wl,--gc-sections -Wl,--no-undefined)
+include_directories(${PROJECT_SOURCE_DIR}/include)
+add_library(${TARGETS_HSBINDER} MODULE ${binding_hs_sources})
 
-add_library(${TARGETS_SMBINDER} MODULE ${binding_hs_sources})
-
-target_compile_options(${TARGETS_SMBINDER} PRIVATE ${hs_binding_depends_CFLAGS})
+target_compile_options(${TARGETS_HSBINDER} PRIVATE ${hs_binding_depends_CFLAGS})
 if(DEFINED DEBUGMODE)
- target_compile_options(${TARGETS_SMBINDER} PRIVATE -g -O0)
+ target_compile_options(${TARGETS_HSBINDER} PRIVATE -g -O0)
 else(DEFINED DEBUGMODE)
- target_compile_options(${TARGETS_SMBINDER} PRIVATE -g -O2)
+ target_compile_options(${TARGETS_HSBINDER} PRIVATE -g -O2)
 endif(DEFINED DEBUGMODE)
 
-target_include_directories(${TARGETS_SMBINDER} PRIVATE ${hs_binding_depends_INCLUDE_DIRS})
-target_link_libraries(${TARGETS_SMBINDER} ${CMAKE_THREAD_LIBS_INIT} ${link_libraries} ${hs_binding_depends_LIBRARIES})
+target_include_directories(${TARGETS_HSBINDER} PRIVATE ${hs_binding_depends_INCLUDE_DIRS})
+target_link_libraries(${TARGETS_HSBINDER} ${CMAKE_THREAD_LIBS_INIT} ${link_libraries} ${hs_binding_depends_LIBRARIES})
 
 # Binder exposes a unique public entry point
 
-set_target_properties(${TARGETS_SMBINDER} PROPERTIES
+set_target_properties(${TARGETS_HSBINDER} PROPERTIES
     PREFIX ""
     LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export.map"
     )
 
 # installation directory
-#INSTALL(TARGETS ${TARGETS_SMBINDER}
+#INSTALL(TARGETS ${TARGETS_HSBINDER}
 #    LIBRARY DESTINATION ${binding_install_dir})
 
 if(NOT EXISTS ${PROJECT_BINARY_DIR}/package)
-    add_custom_command(TARGET ${TARGETS_SMBINDER} POST_BUILD
+    add_custom_command(TARGET ${TARGETS_HSBINDER} POST_BUILD
         COMMAND cp -rf ${PROJECT_SOURCE_DIR}/package ${PROJECT_BINARY_DIR}
     )
 endif()
 
-add_custom_command(TARGET ${TARGETS_SMBINDER} POST_BUILD
+add_custom_command(TARGET ${TARGETS_HSBINDER} POST_BUILD
     COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/root/lib
-    COMMAND cp -rf ${PROJECT_BINARY_DIR}/src/${TARGETS_SMBINDER}.so ${PROJECT_BINARY_DIR}/package/root/lib
+    COMMAND cp -rf ${PROJECT_BINARY_DIR}/src/${TARGETS_HSBINDER}.so ${PROJECT_BINARY_DIR}/package/root/lib
 )
 
 add_custom_target(package DEPENDS ${PROJECT_BINARY_DIR}/package/root
-    COMMAND wgtpkg-pack -f -o ${PROJECT_BINARY_DIR}/package/${TARGETS_SMBINDER}-2017.wgt ${PROJECT_BINARY_DIR}/package/root
+    COMMAND wgtpkg-pack -f -o ${PROJECT_BINARY_DIR}/package/${TARGETS_HSBINDER}.wgt ${PROJECT_BINARY_DIR}/package/root
 )