From: MyoungJune Park Date: Fri, 6 Jan 2017 11:36:01 +0000 (+0900) Subject: add config.h file in CMakefiles.txt X-Git-Tag: submit/tizen_3.0/20170109.051959~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af1b537ea616e958c8f79af5833f83ef27c7880e;p=platform%2Fcore%2Fapi%2Fsystem-settings.git add config.h file in CMakefiles.txt - add configurability to choose resource path with .spec Change-Id: I52c0f249d78c4f869855316874c609bcc01b61cf --- diff --git a/CMakeLists.txt b/CMakeLists.txt index cff12d1..07ac0f1 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,23 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(SYSTEM_SETTINGS_UTIL system-settings-util) SET(LIB_SYSTEM_SETTINGS_UTIL system-settings-util) +#--------------------------------------------------------------- +# include/system-setting-config.h +#--------------------------------------------------------------- +set (VERSION_MAJOR 1) +set (VERSION_MINOR 0) +set (SETTING_DEF_RES_PATH "\"${SETTING_DEF_RES}\"") + +set (SETTING_TIME_ZONEINFO_PATH "\"/usr/share/zoneinfo/\"") +set (SETTING_TZONE_SYMLINK_PATH "\"/opt/etc/localtime\"") + +# DSETTING_DEF_RES +configure_file ( + "${PROJECT_SOURCE_DIR}/system-setting-config.h.in" + "${PROJECT_SOURCE_DIR}/include/system-setting-config.h" +) + + SET(LIBDIR "${CMAKE_LIBDIR}") SET(INC_DIR include) INCLUDE_DIRECTORIES(${INC_DIR}) diff --git a/packaging/capi-system-system-settings.spec b/packaging/capi-system-system-settings.spec index 9b2462a..c2d2b73 100755 --- a/packaging/capi-system-system-settings.spec +++ b/packaging/capi-system-system-settings.spec @@ -93,7 +93,8 @@ cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DTZ_SYS_DATA=%{TZ_SYS_DATA} \ -DTZ_SYS_ETC=%{TZ_SYS_ETC} \ -DTZ_SYS_RO_SHARE=%{TZ_SYS_RO_SHARE} \ - -DTZ_SYS_SHARE=%{TZ_SYS_SHARE} + -DTZ_SYS_SHARE=%{TZ_SYS_SHARE} \ + -DSETTING_DEF_RES=/opt/share/settings make %{?jobs:-j%jobs} diff --git a/src/system_setting_platform.c b/src/system_setting_platform.c index c493e5f..9f03de4 100644 --- a/src/system_setting_platform.c +++ b/src/system_setting_platform.c @@ -45,6 +45,7 @@ #include #include +#include #include #include