X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=bbcf04b1165fd7574c054d84a92d62059bd30612;hb=b6afa1aa893544b459cb767cc5a2ad8d2148228c;hp=c38dd07e0408645104195fbd6e36bdd8a1a27ae1;hpb=1d4de11a907e41c06063a2cd5028dc4101690f50;p=src%2Fapp-framework-main.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c38dd07..bbcf04b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,7 +16,7 @@
 # limitations under the License.
 ###########################################################################
 
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.4.3)
 
 ###########################################################################
 
@@ -56,6 +56,15 @@ else()
 	add_definitions(-DUSE_LIBZIP=0)
 endif()
 
+pkg_check_modules(libsystemd libsystemd>=222)
+if(libsystemd_FOUND)
+	add_compile_options(${libsystemd_CFLAGS})
+	include_directories(${libsystemd_INCLUDE_DIRS})
+	link_libraries(${libsystemd_LIBRARIES})
+else()
+	add_definitions(-DNO_LIBSYSTEMD)
+endif()
+
 ###########################################################################
 
 if(SIMULATE_SECMGR)
@@ -100,6 +109,7 @@ add_library(utils STATIC
 	utils-dir.c
 	utils-file.c
 	utils-json.c
+	utils-systemd.c
 	verbose.c
 	)
 
@@ -115,6 +125,15 @@ add_library(secwrp STATIC
 	secmgr-wrap.c
 	)
 
+add_library(afm STATIC
+	afm-db.c
+	afm-udb.c
+	afm-launch.c
+	afm-launch-mode.c
+	afm-run.c
+	afm-urun.c
+	)
+
 ###########################################################################
 # packaging tools
 
@@ -134,55 +153,35 @@ target_link_libraries(wgtpkg-installer wgtpkg wgt secwrp utils)
 
 install(TARGETS wgtpkg-sign wgtpkg-pack wgtpkg-info wgtpkg-installer DESTINATION ${CMAKE_INSTALL_BINDIR})
 
-###########################################################################
-# the targeted
-
-pkg_check_modules(EXTRA2 libsystemd)
-if(EXTRA2_FOUND)
-	add_compile_options(${EXTRA2_CFLAGS})
-	include_directories(${EXTRA2_INCLUDE_DIRS})
-	link_libraries(${EXTRA2_LIBRARIES})
-
-	add_library(utils2 STATIC
-		utils-jbus.c
-		)
-
-	add_library(afm STATIC
-		afm-db.c
-		afm-launch.c
-		afm-launch-mode.c
-		afm-run.c
-		)
-
+if(libsystemd_FOUND)
 	###########################################################################
 	# the daemons
+
 	MESSAGE(STATUS "Creating daemons")
 
+	add_library(jbus STATIC utils-jbus.c)
+
 	add_executable(afm-user-daemon afm-user-daemon.c)
-	target_link_libraries(afm-user-daemon afm secwrp wgt utils utils2)
+	target_link_libraries(afm-user-daemon afm secwrp wgt utils jbus)
 	install(TARGETS afm-user-daemon DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 	add_executable(afm-system-daemon afm-system-daemon.c)
-	target_link_libraries(afm-system-daemon wgtpkg afm secwrp wgt utils utils2)
+	target_link_libraries(afm-system-daemon wgtpkg afm secwrp wgt utils jbus)
 	install(TARGETS afm-system-daemon DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 	###########################################################################
 	# 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 jbus ${AFB_LIBRARIES})
 		set_target_properties(afm-main-binding PROPERTIES
 			PREFIX ""
 			LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/afm-main-binding.export-map"
@@ -191,8 +190,7 @@ if(EXTRA2_FOUND)
 	else()
 		message(STATUS "Not creating the binding for AFB-DAEMON")
 	endif()
-
-endif(EXTRA2_FOUND)
+endif()
 
 ###########################################################################
 # the tests