X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=7ff88c60cd5de1dcdb37ba934243101152f9935c;hb=9a14082a2f74c0510ff41e952f254c59dc5eda19;hp=43f6f20aeaaebf6b4c83782e076d37a10c71d414;hpb=3a6d178fde5cb81c51948f80d1106128ee7e7139;p=apps%2Fcore%2Fpreloaded%2Fsettings.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 43f6f20..7ff88c6 100755
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,7 @@ pkg_check_modules(pkgs_main REQUIRED
 					  glib-2.0 gthread-2.0 elementary
 					  appcore-common appcore-efl
 					  tapi
-					  utilX heynoti
+					  utilX
 					  dlog json-glib-1.0
 					  ui-gadget-1
 					  capi-appfw-application aul
@@ -13,7 +13,11 @@ pkg_check_modules(pkgs_main REQUIRED
 					  sysman icu-i18n icu-io icu-le icu-lx icu-uc
 					  appsvc libxml-2.0
 					  capi-system-system-settings
-					  dbus-glib-1
+					  capi-network-wifi
+					  capi-network-tethering
+					  capi-network-bluetooth
+					  capi-network-nfc
+					  dbus-glib-1 ewebkit2
 					  ##setting-service
 				  )
 
@@ -47,20 +51,10 @@ ADD_EXECUTABLE(${PROJECT_NAME}
 	./setting.c
 	./setting-main.c
 	./setting-more-menu.c
-	./setting-plugin.c
 	)
 
 ####FOR TEST>>>>########
- ADD_DEFINITIONS("-DPLUGIN")
-# test server
-SET(TEST_PKG_NAME test_server)
-
-ADD_EXECUTABLE(${TEST_PKG_NAME}
-	./plugin-resource/test_server.c
-	)
-TARGET_LINK_LIBRARIES(${TEST_PKG_NAME} -L${CMAKE_BINARY_DIR}/${SETTING_COMMON} -lsetting-common)
-TARGET_LINK_LIBRARIES(${TEST_PKG_NAME} ${pkgs_main_LDFLAGS} "-pie")
-INSTALL(TARGETS ${TEST_PKG_NAME} DESTINATION /opt/apps/${SETTING_PKG_NAME}/bin)
+ADD_DEFINITIONS("-DPLUGIN")
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/plugin-resource/plugin-cfg DESTINATION /opt/data/setting FILES_MATCHING PATTERN "*.cfg")
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/plugin-resource/plugin-xml DESTINATION /opt/data/setting FILES_MATCHING PATTERN "*.xml")
 ####FOR TEST>>>>########
@@ -72,16 +66,29 @@ ADD_EXECUTABLE(${SETTING_CONFUTIL}
 	)
 TARGET_LINK_LIBRARIES(${SETTING_CONFUTIL} -L${CMAKE_BINARY_DIR}/${SETTING_COMMON} -lsetting-common)
 TARGET_LINK_LIBRARIES(${SETTING_CONFUTIL} ${pkgs_main_LDFLAGS} "-pie")
-INSTALL(TARGETS ${SETTING_CONFUTIL} DESTINATION /opt/apps/${SETTING_PKG_NAME}/bin)
+INSTALL(TARGETS ${SETTING_CONFUTIL} DESTINATION /usr/apps/${SETTING_PKG_NAME}/bin)
 
 ####FOR TEST>>>>########
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} -L${CMAKE_BINARY_DIR}/${SETTING_COMMON} -lsetting-common)
+#TARGET_LINK_LIBRARIES(${PROJECT_NAME} -L/usr/apps/${SETTING_PKG_NAME}/lib -lsetting-common)
+# /usr/apps/${SETTING_PKG_NAME}/lib
 
 # dmalloc
 #TARGET_LINK_LIBRARIES(${PROJECT_NAME} -ldmalloc)
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_main_LDFLAGS} "-pie")
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /opt/apps/${SETTING_PKG_NAME}/bin)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/apps/${SETTING_PKG_NAME}/bin)
+
+EXEC_PROGRAM("xmllint"
+  ARGS "${CMAKE_SOURCE_DIR}/org.tizen.setting.xml --noout --schema ${CMAKE_SOURCE_DIR}/manifest.xsd"
+  OUTPUT_VARIABLE output1
+  RETURN_VALUE ret
+  )
+MESSAGE(STATUS "ret=${ret}")
+
+IF (NOT ${ret} EQUAL 0)
+    MESSAGE(FATAL_ERROR "org.tizen.setting.xml may has XML validation error.")
+ENDIF (NOT ${ret} EQUAL 0)
 
 # make setting-theme.edj
 ADD_CUSTOM_TARGET(setting-theme.edj
@@ -89,25 +96,13 @@ ADD_CUSTOM_TARGET(setting-theme.edj
 		${CMAKE_SOURCE_DIR}/resource/setting-theme.edc ${CMAKE_BINARY_DIR}/setting-theme.edj
 		DEPENDS ${CMAKE_SOURCE_DIR}/resource/setting-theme.edc
 )
-ADD_CUSTOM_TARGET(setting-genlist-theme.edj
-		COMMAND edje_cc -id ${CMAKE_SOURCE_DIR}/resource/icons
-		${CMAKE_SOURCE_DIR}/resource/setting-genlist-theme.edc
-		${CMAKE_BINARY_DIR}/setting-genlist-theme.edj
-		DEPENDS ${CMAKE_SOURCE_DIR}/resource/setting-genlist-theme.edc
-)
 
 ADD_DEPENDENCIES(${PROJECT_NAME} setting-theme.edj)
-ADD_DEPENDENCIES(${PROJECT_NAME} setting-genlist-theme.edj)
 
-INSTALL(FILES ${CMAKE_BINARY_DIR}/setting-theme.edj DESTINATION /opt/apps/${SETTING_PKG_NAME}/res/edje/)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/setting-genlist-theme.edj DESTINATION /opt/apps/${SETTING_PKG_NAME}/res/edje/)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/setting-theme.edj DESTINATION /usr/apps/${SETTING_PKG_NAME}/res/edje/)
 
 # install open source license
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/resource/Open_Source_Announcement.html DESTINATION /opt/apps/${SETTING_PKG_NAME}/data)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/resource/ug-setting-accessibility-efl.xml DESTINATION /opt/share/packages)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/resource/ug-setting-font-efl.xml DESTINATION /opt/share/packages)
-
-
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/resource/Open_Source_Announcement.html DESTINATION /usr/apps/${SETTING_PKG_NAME}/data)
 
 
 #------------------------------------------------------------------------------------------
@@ -118,23 +113,17 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/resource/langlist.xml DESTINATION /opt/data/se
 # install desktop file & icon
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/${SETTING_PKG_NAME}.xml DESTINATION /opt/share/packages/)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/${SETTING_PKG_NAME}.xml DESTINATION /usr/share/packages/)
 
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/${SETTING_PKG_NAME}.png DESTINATION /opt/share/icons/default/small)
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/icons DESTINATION /opt/apps/${SETTING_PKG_NAME}/res FILES_MATCHING PATTERN "*.png")
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/images DESTINATION /opt/apps/${SETTING_PKG_NAME}/res FILES_MATCHING PATTERN "*.png")
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/${SETTING_PKG_NAME}.png DESTINATION /usr/share/icons/default/small)
+INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/icons DESTINATION /usr/apps/${SETTING_PKG_NAME}/res FILES_MATCHING PATTERN "*.png")
+INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/images DESTINATION /usr/apps/${SETTING_PKG_NAME}/res FILES_MATCHING PATTERN "*.png")
 
 # install media-data
-IF("${BUILD_ARCH}" STREQUAL "arm")
-	INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/media-data/settings DESTINATION /opt/share PATTERN "*")
-ELSE("${BUILD_ARCH}" STREQUAL "arm")
-	INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/media-data-sdk/settings DESTINATION /opt/share PATTERN "*")
-ENDIF("${BUILD_ARCH}" STREQUAL "arm")
+INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/media-data-sdk/settings DESTINATION /opt/share PATTERN "*")
 
 # install ini file
 # INSTALL(FILES ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.ini DESTINATION share/process-info)
 #add sub directory
 ADD_SUBDIRECTORY(po)
 
-
-