Merge "Adjust verification of application configuration element to current spec."

[framework/web/wrt-installer.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 78004ae..b9bb8b9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@ ENDIF(NOT CMAKE_BUILD_TYPE)
 
 
 #csp from .xml parsing enabled
-OPTION(CSP_SUPPORT "Support for csp policy" ON)
+OPTION(CSP_SUPPORT "Support for csp policy" OFF)
 
 IF(CSP_SUPPORT)
     ADD_DEFINITIONS("-DCSP_ENABLED")
@@ -54,6 +54,8 @@ SET(CMAKE_CXX_FLAGS_CCOV       "-O0 -std=c++0x -g --coverage")
 
 OPTION(DPL_LOG "DPL logs status" ON)
 OPTION(WITH_TESTS "Build tests" OFF)
+OPTION(MULTIPROCESS_SERVICE_SUPPORT "Process per service" OFF)
+OPTION(MULTIPROCESS_SERVICE_SUPPORT_INLINE "Process per service - inline mode support" OFF)
 IF(DPL_LOG AND NOT CMAKE_BUILD_TYPE MATCHES "profiling")
     MESSAGE(STATUS "Logging enabled for DPL")
     ADD_DEFINITIONS("-DDPL_LOGS_ENABLED")
@@ -61,6 +63,12 @@ ELSE(DPL_LOG AND NOT CMAKE_BUILD_TYPE MATCHES "profiling")
     MESSAGE(STATUS "Logging disabled for DPL")
 ENDIF(DPL_LOG AND NOT CMAKE_BUILD_TYPE MATCHES "profiling")
 MESSAGE(STATUS "WITH_TESTS: " ${WITH_TESTS})
+IF(MULTIPROCESS_SERVICE_SUPPORT)
+    ADD_DEFINITIONS("-DMULTIPROCESS_SERVICE_SUPPORT")
+    IF (MULTIPROCESS_SERVICE_SUPPORT_INLINE)
+        ADD_DEFINITIONS("-DMULTIPROCESS_SERVICE_SUPPORT_INLINE")
+    ENDIF(MULTIPROCESS_SERVICE_SUPPORT_INLINE)
+ENDIF(MULTIPROCESS_SERVICE_SUPPORT)
 
 # If supported for the target machine, emit position-independent code,suitable
 # for dynamic linking and avoiding any limit on the size of the global offset
@@ -87,20 +95,6 @@ SET(TARGET_INSTALLER_STATIC "wrt-installer_static")
 SET(TARGET_INSTALLER "wrt-installer")
 SET(TARGET_BACKEND_LIB "wgt")
 
-ADD_CUSTOM_COMMAND(
-    OUTPUT ${PROJECT_SOURCE_DIR}/data/widget_install_popup.edj
-    COMMAND edje_cc
-    ARGS  ${PROJECT_SOURCE_DIR}/data/widget_install_popup.edc
-          ${PROJECT_SOURCE_DIR}/data/widget_install_popup.edj
-    DEPENDS ${PROJECT_SOURCE_DIR}/data/widget_install_popup.edc
-    )
-ADD_CUSTOM_TARGET(widget_install_popup ALL DEPENDS
-    ${PROJECT_SOURCE_DIR}/data/widget_install_popup.edj
-    )
-INSTALL(FILES   ${PROJECT_SOURCE_DIR}/data/widget_install_popup.edj
-    DESTINATION share/edje/wrt
-    )
-
 ############################# subdirectories ##################################
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(etc)