X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=f121a6265aba4fac941b2953d442dc807aaa4b26;hb=2a8b46d16ea5d0c99831e95b47cab037f220f7af;hp=91a2cc149eb5a8c329b8f9e73e09051778339149;hpb=18103e986d89b9e329f49d9329d8bc40dffd39eb;p=src%2Fapp-framework-main.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 91a2cc1..f121a62 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>
 #
@@ -16,7 +16,7 @@
 # limitations under the License.
 ###########################################################################
 
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.4.3)
 
 ###########################################################################
 
@@ -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})
@@ -86,21 +86,29 @@ add_library(wgtpkg STATIC
 	wgtpkg-digsig.c
 	wgtpkg-files.c
 	wgtpkg-install.c
+	wgtpkg-mustach.c
 	wgtpkg-permissions.c
 	wgtpkg-uninstall.c
+	wgtpkg-unit.c
 	wgtpkg-workdir.c
 	wgtpkg-xmlsec.c
 	wgtpkg-zip.c
 	)
 
 add_library(utils STATIC
+	mustach.c
 	utils-dir.c
+	utils-file.c
+	utils-json.c
+	utils-systemd.c
 	verbose.c
 	)
 
 add_library(wgt STATIC
 	wgt-config.c
 	wgt-info.c
+	wgt-strings.c
+	wgt-json.c
 	wgt.c
 	)
 
@@ -130,15 +138,14 @@ install(TARGETS wgtpkg-sign wgtpkg-pack wgtpkg-info wgtpkg-installer DESTINATION
 ###########################################################################
 # the targeted
 
-pkg_check_modules(EXTRA2 json-c libsystemd)
-if(EXTRA2_FOUND)
-	add_compile_options(${EXTRA2_CFLAGS})
-	include_directories(${EXTRA2_INCLUDE_DIRS})
-	link_libraries(${EXTRA2_LIBRARIES})
+pkg_check_modules(SYSTEMD libsystemd>=222)
+if(SYSTEMD_FOUND)
+	add_compile_options(${SYSTEMD_CFLAGS})
+	include_directories(${SYSTEMD_INCLUDE_DIRS})
+	link_libraries(${SYSTEMD_LIBRARIES})
 
 	add_library(utils2 STATIC
 		utils-jbus.c
-		utils-json.c
 		)
 
 	add_library(afm STATIC
@@ -163,20 +170,16 @@ if(EXTRA2_FOUND)
 	###########################################################################
 	# the binding for afb
 
-	pkg_check_modules(afb afb-daemon)
-	if(afb_FOUND)
+	pkg_check_modules(AFB afb-daemon)
+	if(AFB_FOUND)
 		message(STATUS "Creation afm-main-binding for AFB-DAEMON")
 		###############################################################
-		#pkg_get_variable(afb_binding_install_dir afb-daemon binding_install_dir)
-		execute_process(
-			COMMAND pkg-config --variable binding_install_dir afb-daemon
-			OUTPUT_VARIABLE afb_binding_install_dir OUTPUT_STRIP_TRAILING_WHITESPACE
-		)
+		pkg_get_variable(afb_binding_install_dir afb-daemon binding_install_dir)
 		###############################################################
 		add_library(afm-main-binding MODULE afm-main-binding.c)
-		target_compile_options(afm-main-binding PRIVATE ${afb_CFLAGS})
-		target_include_directories(afm-main-binding PRIVATE ${afb_INCLUDE_DIRS})
-		target_link_libraries(afm-main-binding utils utils2 ${afb_LIBRARIES})
+		target_compile_options(afm-main-binding PRIVATE ${AFB_CFLAGS})
+		target_include_directories(afm-main-binding PRIVATE ${AFB_INCLUDE_DIRS})
+		target_link_libraries(afm-main-binding utils utils2 ${AFB_LIBRARIES})
 		set_target_properties(afm-main-binding PROPERTIES
 			PREFIX ""
 			LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/afm-main-binding.export-map"
@@ -186,4 +189,10 @@ if(EXTRA2_FOUND)
 		message(STATUS "Not creating the binding for AFB-DAEMON")
 	endif()
 
-endif(EXTRA2_FOUND)
+endif(SYSTEMD_FOUND)
+
+###########################################################################
+# the tests
+
+add_subdirectory(tests)
+