Merge "packaging: spec cleanup" into tizen

[apps/core/preloaded/settings.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 461cebc..631e71f 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,6 @@ SET(SETTING_SECURITY setting-security)
 SET(SETTING_DISPLAY setting-display)
 SET(SETTING_TIME setting-time)
 SET(SETTING_PHONE setting-phone)
-SET(SETTING_MEMORY setting-memory)
 SET(SETTING_RESET setting-reset)
 SET(SETTING_PASSWORD setting-password)
 SET(SETTING_COMMON setting-common)
@@ -30,10 +29,10 @@ SET(SETTING_POWERSAVING setting-powersaving)
 SET(SETTING_FONT setting-font)
 SET(SETTING_STORAGE setting-storage)
 SET(SETTING_FILEVIEW setting-fileview)
-
+SET(SETTING_PLUGIN setting-plugin)
+SET(SETTING_PRIVACY setting-privacy)
 SET(SETTING_PROFILE_UG ug-setting-profile-efl)
 SET(SETTING_DEVELOPEROPTION_UG ug-setting-developeroption-efl)
-SET(SETTING_MEMORY_UG ug-setting-memory-efl)
 SET(SETTING_SECURITY_UG ug-setting-security-efl)
 SET(SETTING_DISPLAY_UG ug-setting-display-efl)
 SET(SETTING_TIME_UG ug-setting-time-efl)
@@ -47,6 +46,8 @@ SET(SETTING_MENUSCREEN_UG ug-setting-menuscreen-sel-efl)
 SET(SETTING_POWERSAVING_UG ug-setting-powersaving-efl)
 SET(SETTING_FONT_UG ug-setting-font-efl)
 SET(SETTING_STORAGE_UG ug-setting-storage-efl)
+SET(SETTING_PLUGIN_UG ug-setting-plugin-efl)
+SET(SETTING_PRIVACY_UG ug-setting-privacy-efl)
 
 SET(LIB_SETTING_COMMON setting-common)
 
@@ -54,23 +55,24 @@ SET(LIB_SETTING_COMMON setting-common)
 #setting main view build start
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
-
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_COMMON})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_STORAGE})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_PLUGIN})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_STORAGE})
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_PHONE})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_CONNECTIVITY})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_CONNECTIVITY})
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_DISPLAY})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_MEMORY})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_NETWORK})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_PROFILE})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_RESET})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_SECURITY})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_TIME})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_NETWORK})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_PROFILE})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_RESET})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_SECURITY})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_TIME})
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_ABOUT})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_PASSWORD})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_MENUSCREEN})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_POWERSAVING})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_FONT})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_FILEVIEW})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_PASSWORD})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_MENUSCREEN})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_POWERSAVING})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_FONT})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_FILEVIEW})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_PRIVACY})
 ADD_SUBDIRECTORY(src)
 
+