X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=5e321ea77b02a4e1095245929d547c858b850bfc;hb=276d6124ee3dfc8802e9a0fb4fc7b1e2034dfb24;hp=991b5b80dc511bddaaa9efb55ee552669e66ba72;hpb=3a6e947bef1b2942e24d2fdee1a76dbf3305b508;p=src%2Fapp-framework-main.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 991b5b8..5e321ea 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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,28 @@ 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
 	verbose.c
 	)
 
 add_library(wgt STATIC
 	wgt-config.c
 	wgt-info.c
+	wgt-strings.c
+	wgt-json.c
 	wgt.c
 	)
 
@@ -130,15 +137,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,8 +169,8 @@ 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)
@@ -174,9 +180,9 @@ if(EXTRA2_FOUND)
 		)
 		###############################################################
 		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 +192,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)
+