From c2f66478d9d97fc919d8d9e0a41e0123586a7ee1 Mon Sep 17 00:00:00 2001 From: MyoungJune Park Date: Fri, 6 Jan 2017 20:36:01 +0900 Subject: [PATCH] add config.h file in CMakefiles.txt - add configurability to choose resource path with .spec Change-Id: I52c0f249d78c4f869855316874c609bcc01b61cf Signed-off-by: MyoungJune Park --- CMakeLists.txt | 3 +++ src/system_setting_platform.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bf335a7..0c93dcb 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,7 @@ 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" @@ -62,6 +63,8 @@ ADD_DEFINITIONS("-D_TZ_SYS_DATA=\"${TZ_SYS_DATA}\"") ADD_DEFINITIONS("-D_TZ_SYS_ETC=\"${TZ_SYS_ETC}\"") ADD_DEFINITIONS("-D_TZ_SYS_RO_SHARE=\"${TZ_SYS_RO_SHARE}\"") ADD_DEFINITIONS("-D_TZ_SYS_SHARE=\"${TZ_SYS_SHARE}\"") +ADD_DEFINITIONS("-DSETTING_DEF_RES=\"${SETTING_DEF_RES}\"") + SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib") diff --git a/src/system_setting_platform.c b/src/system_setting_platform.c index e9a9199..491e8ae 100644 --- a/src/system_setting_platform.c +++ b/src/system_setting_platform.c @@ -282,7 +282,7 @@ int _is_file_accessible(const char *path) /*////////////////////////////////////////////////////////////////////////////////////////////////// */ // @todo move to CMake -#define DEF_RINGTONE_FILE_PATH SETTING_DEF_RES_PATH"/Ringtones" +#define DEF_RINGTONE_FILE_PATH SETTING_DEF_RES"/Ringtones" #define USR_RINGTONE_FILE_PATH "/home/owner/content/Sounds/Ringtones" #define JSONFILE "/opt/home/owner/apps_rw/org.tizen.setting/data/.user-ringtones.json" -- 2.7.4