Merge "fixed N_SE_12778"

[apps/core/preloaded/settings.git] / setting-common / CMakeLists.txt

diff --git a/setting-common/CMakeLists.txt b/setting-common/CMakeLists.txt
index 7f675fc..0091f48 100755 (executable)
--- a/setting-common/CMakeLists.txt
+++ b/setting-common/CMakeLists.txt
@@ -10,6 +10,12 @@
 #ADD_SUBDIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/${LIB_SETTING_COMMON_VIEW})
 #ADD_SUBDIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/${LIB_SETTING_COMMON_DATA})
 
+#INSTALL(
+#        DIRECTORY "include" DESTINATION /usr/local/include
+#        FILES_MATCHING
+#        PATTERN "*.h"
+#        )
+
 
 # LIB_SETTING_COMMON - setting-common
 
@@ -19,7 +25,7 @@ PROJECT(${LIB_SETTING_COMMON})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs_common_data REQUIRED appcore-efl elementary vconf openssl evas ecore ecore-imf json-glib-1.0 edje glib-2.0 libxml-2.0 ui-gadget-1 capi-appfw-application capi-system-info capi-system-system-settings)
+pkg_check_modules(pkgs_common_data REQUIRED utilX appcore-efl elementary vconf openssl evas ecore ecore-imf json-glib-1.0 edje glib-2.0 libxml-2.0 ui-gadget-1 capi-appfw-application capi-system-info capi-system-system-settings)
 
 FOREACH(flag ${pkgs_common_data_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
@@ -35,6 +41,7 @@ ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
+ADD_DEFINITIONS("-fpie")
 
 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl, --rpath=/usr/lib")
 
@@ -54,7 +61,7 @@ ADD_LIBRARY(${LIB_SETTING_COMMON} SHARED
 
 TARGET_LINK_LIBRARIES(${LIB_SETTING_COMMON} ${pkgs_common_data_LDFLAGS})
 SET_TARGET_PROPERTIES(${LIB_SETTING_COMMON} PROPERTIES VERSION 0.1.0 SOVERSION 1)
-INSTALL(TARGETS ${LIB_SETTING_COMMON} DESTINATION /opt/apps/${SETTING_PKG_NAME}/lib)
+INSTALL(TARGETS ${LIB_SETTING_COMMON} DESTINATION /usr/apps/${SETTING_PKG_NAME}/lib)