X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=f1263465b1b6ab45fab62f5088219eccbe96eecd;hb=a85c80f25325c69579f3b6c6df847d631e68d0b5;hp=66102516d3f81f476379af3c82d2d793282ff46a;hpb=38ba270af828b80e0ffb5eab955aff733de17dba;p=src%2Fapp-framework-main.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6610251..f126346 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 ###########################################################################
-# Copyright 2015 IoT.bzh
+# Copyright 2015, 2016, 2017 IoT.bzh
 #
 # author: José Bollo <jose.bollo@iot.bzh>
 #
@@ -41,7 +41,7 @@ set(CMAKE_C_FLAGS_CCOV         "-g -O2 --coverage")
 
 include(FindPkgConfig)
 
-pkg_check_modules(EXTRAS REQUIRED libxml-2.0 openssl xmlsec1 xmlsec1-openssl)
+pkg_check_modules(EXTRAS REQUIRED libxml-2.0 openssl xmlsec1 xmlsec1-openssl json-c)
 add_compile_options(${EXTRAS_CFLAGS})
 include_directories(${EXTRAS_INCLUDE_DIRS})
 link_libraries(${EXTRAS_LIBRARIES})
@@ -58,14 +58,25 @@ endif()
 
 ###########################################################################
 
-if(USE_SIMULATION)
-	include_directories(simulation)
-else(USE_SIMULATION)
+if(SIMULATE_SECMGR)
+	add_definitions(-DSIMULATE_SECURITY_MANAGER=1)
+else(SIMULATE_SECMGR)
 	pkg_check_modules(SECMGR REQUIRED security-manager)
 	add_compile_options(${SECMGR_CFLAGS})
 	include_directories(${SECMGR_INCLUDE_DIRS})
 	link_libraries(${SECMGR_LIBRARIES})
-endif(USE_SIMULATION)
+	add_definitions(-DSIMULATE_SECURITY_MANAGER=0)
+endif(SIMULATE_SECMGR)
+
+if(SIMULATE_SMACK)
+	add_definitions(-DSIMULATE_LIBSMACK=1)
+else(SIMULATE_SMACK)
+	pkg_check_modules(SMACK REQUIRED libsmack)
+	add_compile_options(${SMACK_CFLAGS})
+	include_directories(${SMACK_INCLUDE_DIRS})
+	link_libraries(${SMACK_LIBRARIES})
+	add_definitions(-DSIMULATE_LIBSMACK=0)
+endif(SIMULATE_SMACK)
 
 ###########################################################################
 
@@ -84,12 +95,15 @@ add_library(wgtpkg STATIC
 
 add_library(utils STATIC
 	utils-dir.c
+	utils-file.c
+	utils-json.c
 	verbose.c
 	)
 
 add_library(wgt STATIC
 	wgt-config.c
 	wgt-info.c
+	wgt-strings.c
 	wgt.c
 	)
 
@@ -119,7 +133,7 @@ install(TARGETS wgtpkg-sign wgtpkg-pack wgtpkg-info wgtpkg-installer DESTINATION
 ###########################################################################
 # the targeted
 
-pkg_check_modules(EXTRA2 json-c libsystemd)
+pkg_check_modules(EXTRA2 libsystemd)
 if(EXTRA2_FOUND)
 	add_compile_options(${EXTRA2_CFLAGS})
 	include_directories(${EXTRA2_INCLUDE_DIRS})
@@ -127,7 +141,6 @@ if(EXTRA2_FOUND)
 
 	add_library(utils2 STATIC
 		utils-jbus.c
-		utils-json.c
 		)
 
 	add_library(afm STATIC