From 2ea3e1fa018fb4dd8d8acb80988832df2f5cf10d Mon Sep 17 00:00:00 2001 From: zheng_wenlong Date: Wed, 25 Oct 2017 17:34:50 +0900 Subject: Modify the library name in CmakeLists.txt A wrong name is used in CMakeLists.txt (SM = soundmanager instead of HS = homescreen). Fix CMakeLists.txt by replacing SM with HS. BUG-AGL: SPEC-995 Change-Id: Id6273295982106705da0d63be89f50c05f4d6567 Signed-off-by: zheng_wenlong --- src/CMakeLists.txt | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5dcc0a5..363cdae 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -16,7 +16,7 @@ cmake_minimum_required(VERSION 2.8) -set(TARGETS_SMBINDER homescreen-service) +set(TARGETS_HSBINDER homescreen-service) INCLUDE(FindThreads) FIND_PACKAGE(Threads) @@ -27,41 +27,41 @@ set(binding_hs_sources hs-helper.c) 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}-2017.wgt ${PROJECT_BINARY_DIR}/package/root ) -- cgit 1.2.3-korg