From bf0cde16984c8ce69dd6e0c6d4bdacaa7570e095 Mon Sep 17 00:00:00 2001 From: "jc815.lee" Date: Tue, 16 Apr 2013 15:48:07 +0900 Subject: fix privacy popup build error Change-Id: I31a98c90afc9bf30e861d80c205e5e2405d3aa7b --- privacy-popup/CMakeLists.txt | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/privacy-popup/CMakeLists.txt b/privacy-popup/CMakeLists.txt index 614f530..377ca51 100755 --- a/privacy-popup/CMakeLists.txt +++ b/privacy-popup/CMakeLists.txt @@ -1,6 +1,5 @@ INCLUDE(FindPkgConfig) -pkg_check_modules(privacy-popup-ug-test_pkgs -#pkg_check_modules(privacy-popup_pkgs +pkg_check_modules(privacy-popup_pkgs REQUIRED elementary evas @@ -11,17 +10,15 @@ pkg_check_modules(privacy-popup-ug-test_pkgs appcore-efl ) SET (this_target tizenprv00.privacy-popup) -#SET (this_target privacy-manager-privacy-popup) SET(SRCS privacy-popup.c ) #SET(INCLUDEDIR "\${prefix}/include") -#INCLUDE_DIRECTORIES(${privacy-popup_pkgs_INCLUDE_DIRS}) -INCLUDE_DIRECTORIES(${privacy-popup-ug-test_pkgs_INCLUDE_DIRS}) +INCLUDE_DIRECTORIES(${privacy-popup_pkgs_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/inc) -INCLUDE_DIRECTORIES(${ug-privacy-popup-ug-efl_pkgs_INCLUDE_DIRS} /usr/include/privacy_manager) +INCLUDE_DIRECTORIES(/usr/include/privacy_manager) FIND_PROGRAM(UNAME NAMES uname) @@ -44,15 +41,15 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed") ADD_EXECUTABLE(${this_target} ${SRCS}) #TARGET_LINK_LIBRARIES(${this_target} --as-needed -pie) -#TARGET_LINK_LIBRARIES(${this_target} ${privacy-popup_pkgs_LDFLAGS} ${privacy-popup_pkgs_LIBRARIES}) + +ADD_DEPENDENCIES(${this_target} privacy-manager-client) +TARGET_LINK_LIBRARIES(${this_target} ${privacy-popup_pkgs_LDFLAGS} ${privacy-popup_pkgs_LIBRARIES}) TARGET_LINK_LIBRARIES(${this_target} "-lpkgmgr-info") -TARGET_LINK_LIBRARIES(${this_target} "-lprivacy-manager-client") -TARGET_LINK_LIBRARIES(${this_target} ${privacy-popup-ug-test_pkgs_LDFLAGS} ${privacy-popup-ug-test_pkgs_LIBRARIES}) +TARGET_LINK_LIBRARIES(${this_target} "-lprivacy-manager-client" "-L../client") TARGET_LINK_LIBRARIES(${this_target} - #${privacy-popup_LIBRARIES} - ${privacy-popup-ug-test_LIBRARIES} + ${privacy-popup_LIBRARIES} ) -- cgit v1.2.3