Applied cmake configuration.

Change-Id: Ie28bc8d728216d822b0c7044415b8774f02d0806
Signed-off-by: jinwang.an <jinwang.an@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96a5b0eda23732d9dcc0cbda1c6a5b35f8422457..5ce46288ecc673ad77a50cb1df2bf88c8ccc2f09 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,17 +63,23 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -Werror")
 #      MESSAGE("tiznew build!!!!!!!!!")
 #ENDIF(FEATURE_SETTING_TIZENW2)
 
+
+
 IF(FEATURE_SETTING_SDK)
        MESSAGE("tiznew2 sdk build!!!!!!!!!")
        ADD_DEFINITIONS("-DFEATURE_SETTING_SDK")
 ELSE(FEATURE_SETTING_SDK)
        MESSAGE("tiznew2 build!!!!!!!!!")
 ENDIF(FEATURE_SETTING_SDK)
-IF(FEATURE_SETTING_EMUL)
-       ADD_DEFINITIONS("-DFEATURE_SETTING_EMUL")
-       MESSAGE("tiznew2 emul build!!!!!!!!!")
-ENDIF(FEATURE_SETTING_EMUL)
-
+IF(FEATURE_EMUL)
+       SET(FEATURE_SETTING_EMUL "1")
+       MESSAGE("emul build!!!!!!!!!")
+ELSE(FEATURE_EMUL)
+       SET(FEATURE_SETTING_EMUL "0")
+       MESSAGE("target build!!!!!!!!!")
+ENDIF(FEATURE_EMUL)
+
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.in ${CMAKE_SOURCE_DIR}/include/watch_setting_config.h)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 INCLUDE(FindPkgConfig)
@@ -110,16 +116,16 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/images/ DESTINATION ${TZ_SYS_
        INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/media-data-sdk/settings/ DESTINATION ${TZ_SYS_GLOBALUSER_DATA}/settings PATTERN "*")
 
 # install langlist xml file
-IF(FEATURE_SETTING_EMUL)
+IF(FEATURE_EMUL)
        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/langlist_emul.xml DESTINATION ${DATADIR} RENAME langlist.xml)
        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/langlist_emul.xml DESTINATION ${TZ_SYS_GLOBALUSER_DATA}/setting RENAME langlist.xml)
 ELSEIF(FEATURE_SETTING_SDK)
        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/langlist_emul.xml DESTINATION ${DATADIR} RENAME langlist.xml)
        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/langlist_emul.xml DESTINATION ${TZ_SYS_GLOBALUSER_DATA}/setting RENAME langlist.xml)
-ELSE(FEATURE_SETTING_EMUL)
+ELSE(FEATURE_EMUL)
        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/langlist.xml DESTINATION ${DATADIR})
        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/langlist.xml DESTINATION ${TZ_SYS_GLOBALUSER_DATA}/setting)
-ENDIF(FEATURE_SETTING_EMUL)
+ENDIF(FEATURE_EMUL)
 #INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/langlist_all.xml DESTINATION ${DATADIR})
 
 # install clocklist xml file

diff --git a/config.h.in b/config.h.in
new file mode 100644 (file)
index 0000000..004a390
--- /dev/null
+++ b/config.h.in
@@ -0,0 +1,12 @@
+/*--------------------------------------------------------------------------
+ * This file is autogenerated from config.h.in
+ * during the cmake configuration of your project. If you need to make changes
+ * edit the original file NOT THIS FILE.
+ * --------------------------------------------------------------------------*/
+#ifndef _CONFIGURATION_HEADER_WATCH_SETTING_H_
+#define _CONFIGURATION_HEADER_WATCH_SETTING_H_
+
+#cmakedefine FEATURE_SETTING_EMUL @FEATURE_SETTING_EMUL@
+
+#endif //_CONFIGURATION_HEADER_WATCH_SETTING_H_
+

diff --git a/include/setting-display.h b/include/setting-display.h
index cf9ba94a49b324f26d2c1176811ab568ced18d9d..d3bf1054610f9e06e6fb75020a986fc2b51a3aea 100644 (file)
--- a/include/setting-display.h
+++ b/include/setting-display.h
@@ -21,6 +21,7 @@
 #include <Elementary.h>
 #include <libintl.h>
 #include <string.h>
+#include "watch_setting_config.h"
 
 #define MENU_COUNT             7
 #define FONT_SIZE_COUNT                3

diff --git a/include/util.h b/include/util.h
index 10c38e60e460691a640a19d3bb75af68d0d6c99d..1cbb243d5ca146ee3f6724214e0d922220a4fe12 100644 (file)
--- a/include/util.h
+++ b/include/util.h
@@ -18,6 +18,7 @@
 #include <system_info_type.h>
 
 #include "setting_debug.h"
+#include "watch_setting_config.h"
 
 #ifndef VCONFKEY_SETAPPL_AOD_ON_PIXEL_RATIO
 #define VCONFKEY_SETAPPL_AOD_ON_PIXEL_RATIO "db/setting/aod_on_pixel_ratio"

diff --git a/packaging/org.tizen.watch-setting.spec b/packaging/org.tizen.watch-setting.spec
index 818731fa966f21a92abf7bbf31c39424fe84306a..de267200ed5993fad90f5603cfa83783b9f1e926 100644 (file)
--- a/packaging/org.tizen.watch-setting.spec
+++ b/packaging/org.tizen.watch-setting.spec
@@ -99,7 +99,7 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} \
        -DFEATURE_SETTING_SDK=YES \
 %endif
 %ifarch %{ix86}
-       -DFEATURE_SETTING_EMUL=YES \
+       -DFEATURE_EMUL=YES \
 %endif
 #%if "%{?sec_build_project_name}" == "rinato_eur_open"
 #      -DFEATURE_SETTING_TIZENW2=YES \