Update wrt-security_0.0.42

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d465fb..a325781 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,6 +39,8 @@ SET(CMAKE_CXX_FLAGS_DEBUG      "-O0 -std=c++0x -g")
 SET(CMAKE_C_FLAGS_RELEASE      "-O2 -g")
 SET(CMAKE_CXX_FLAGS_RELEASE    "-O2 -std=c++0x -g")
 
+#SET(SMACK_ENABLE ON)
+
 OPTION(DPL_LOG "DPL logs status" ON)
 IF(DPL_LOG)
     MESSAGE(STATUS "Logging enabled for DPL")
@@ -52,7 +54,6 @@ ENDIF(DPL_LOG)
 # table. This option makes a difference on the m68k, PowerPC and SPARC.
 # (BJ: our ARM too?)
 ADD_DEFINITIONS("-fPIC")
-ADD_DEFINITIONS("-DSEPARATED_SINGLETON_IMPLEMENTATION")
 
 # Set the default ELF image symbol visibility to hidden - all symbols will be
 # marked with this unless overridden within the code.
@@ -67,7 +68,10 @@ ADD_DEFINITIONS("-Wno-deprecated")               # No warnings about deprecated
 ADD_DEFINITIONS("-std=c++0x")               # No warnings about deprecated features
 STRING(REGEX MATCH "([^.]*)" API_VERSION "${VERSION}")
 ADD_DEFINITIONS("-DAPI_VERSION=\"$(API_VERSION)\"")
-#ADD_DEFINITIONS("-DWRT_SMACK_ENABLED")
+
+IF(SMACK_ENABLE)
+    ADD_DEFINITIONS("-DWRT_SMACK_ENABLED")
+ENDIF(SMACK_ENABLE)
 
 ############################# Targets names ###################################
 
@@ -77,6 +81,9 @@ SET(TARGET_ACE_DAO_RO_LIB "ace-dao-ro")
 SET(TARGET_ACE_DAO_RW_LIB "ace-dao-rw")
 SET(TARGET_ACE_LIB "ace")
 SET(TARGET_ACE_CLIENT_LIB "ace-client")
+SET(TARGET_ACE_SETTINGS_LIB "ace-settings")
+SET(TARGET_ACE_INSTALL_LIB "ace-install")
+SET(TARGET_ACE_POPUP_VALIDATION_LIB "ace-popup-validation")
 SET(TARGET_WRT_POPUP "wrt-popup")
 
 ############################# subdirectories ##################################
@@ -84,9 +91,13 @@ SET(TARGET_WRT_POPUP "wrt-popup")
 ADD_SUBDIRECTORY(vcore)
 ADD_SUBDIRECTORY(ace)
 ADD_SUBDIRECTORY(ace_client)
+ADD_SUBDIRECTORY(ace_common)
+ADD_SUBDIRECTORY(ace_install)
+ADD_SUBDIRECTORY(ace_settings)
+ADD_SUBDIRECTORY(ace_popup_validation)
 ADD_SUBDIRECTORY(popup_process)
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(build)
-#ADD_SUBDIRECTORY(tests)
+ADD_SUBDIRECTORY(tests)
 ADD_SUBDIRECTORY(etc)