Merge remote-tracking branch 'origin/tizen' into ode

[platform/core/test/security-tests.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c085522..ce88a43 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,6 +64,7 @@ IF(BUILD_ALL_TESTS)
     SET(BUILD_CYNARA ON)
     SET(BUILD_WEB ON)
     SET(BUILD_YACA ON)
+    SET(BUILD_ODE ON)
 ENDIF(BUILD_ALL_TESTS)
 
 # If supported for the target machine, emit position-independent code,suitable
@@ -88,7 +89,7 @@ ADD_DEFINITIONS("-DAPP_USER=\"${APP_USER}\"")
 
 # Enabler for popups; this should be done on system-level somewhere, but since it isn't
 # and we already have such definition in security-manager, lets have it also here
-# ADD_DEFINITIONS("-DASKUSER_ENABLED")
+ADD_DEFINITIONS("-DASKUSER_ENABLED")
 
 IF(SMACK_ENABLE)
     ADD_DEFINITIONS("-DWRT_SMACK_ENABLED")
@@ -100,7 +101,9 @@ ENDIF(NOT DEFINED SHARE_INSTALL_PREFIX)
 
 ############################# Targets names ###################################
 
+SET(TARGET_CKM_TEST_COMMON "ckm-test-common")
 SET(TARGET_CKM_TESTS "ckm-tests")
+SET(TARGET_CKM_PRIVILEGED_TESTS "ckm-privileged-tests")
 SET(TARGET_CKMI_TESTS "ckm-integration-tests")
 SET(COMMON_TARGET_TEST "tests-common")