Enable CSP & allow-navigation

[Issue#] N/A
[Problem] N/A
[Cause] N/A
[Solution] Enable CSP & allow-navigation
[SCMRequest] N/A

Change-Id: Ia0953c9e28e2fadec574729cba41cd0c39b0c0dc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9bb8b9..a548f68 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,13 +34,12 @@ ENDIF(NOT CMAKE_BUILD_TYPE)
 
 ############################# compilation defines #############################
 
-
-#csp from .xml parsing enabled
-OPTION(CSP_SUPPORT "Support for csp policy" OFF)
-
-IF(CSP_SUPPORT)
-    ADD_DEFINITIONS("-DCSP_ENABLED")
-ENDIF(CSP_SUPPORT)
+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)
+OPTION(CSP_SUPPORT "Support for csp policy" ON)
+OPTION(ALLOW_NAVIGATION_SUPPORT "Support for allow-navigation" ON)
 
 ############################# compiler flags ##################################
 
@@ -52,10 +51,6 @@ SET(CMAKE_C_FLAGS_RELEASE      "-O2 -g")
 SET(CMAKE_CXX_FLAGS_RELEASE    "-O2 -std=c++0x -g")
 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")
@@ -69,6 +64,12 @@ IF(MULTIPROCESS_SERVICE_SUPPORT)
         ADD_DEFINITIONS("-DMULTIPROCESS_SERVICE_SUPPORT_INLINE")
     ENDIF(MULTIPROCESS_SERVICE_SUPPORT_INLINE)
 ENDIF(MULTIPROCESS_SERVICE_SUPPORT)
+IF(CSP_SUPPORT)
+    ADD_DEFINITIONS("-DCSP_ENABLED")
+ENDIF(CSP_SUPPORT)
+IF(ALLOW_NAVIGATION_SUPPORT)
+    ADD_DEFINITIONS("-DALLOW_NAVIGATION_ENABLED")
+ENDIF(CSP_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