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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c38dd07..b112d55 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 ###########################################################################
-# Copyright 2015, 2016, 2017 IoT.bzh
+# Copyright (C) 2015-2019 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)
 
 ###########################################################################
 
@@ -45,17 +45,37 @@ pkg_check_modules(EXTRAS REQUIRED libxml-2.0 openssl xmlsec1 xmlsec1-openssl jso
 add_compile_options(${EXTRAS_CFLAGS})
 include_directories(${EXTRAS_INCLUDE_DIRS})
 link_libraries(${EXTRAS_LIBRARIES})
+link_directories(${EXTRAS_LIBRARY_DIRS})
 
 pkg_check_modules(libzip libzip>=0.11)
 if(libzip_FOUND AND USE_LIBZIP)
 	add_compile_options(${libzip_CFLAGS})
 	include_directories(${libzip_INCLUDE_DIRS})
 	link_libraries(${libzip_LIBRARIES})
+	link_directories(${libzip_LIBRARY_DIRS})
 	add_definitions(-DUSE_LIBZIP=1)
 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})
+	link_directories(${libsystemd_LIBRARY_DIRS})
+else()
+	add_definitions(-DNO_LIBSYSTEMD)
+endif()
+
+pkg_check_modules(AFB afb-daemon>=4.99 libafbwsc>=4.99)
+if(AFB_FOUND)
+	add_compile_options(${AFB_CFLAGS})
+	include_directories(${AFB_INCLUDE_DIRS})
+	link_libraries(${AFB_LIBRARIES})
+	link_directories(${AFB_LIBRARY_DIRS})
+endif()
+
 ###########################################################################
 
 if(SIMULATE_SECMGR)
@@ -65,6 +85,7 @@ else(SIMULATE_SECMGR)
 	add_compile_options(${SECMGR_CFLAGS})
 	include_directories(${SECMGR_INCLUDE_DIRS})
 	link_libraries(${SECMGR_LIBRARIES})
+	link_directories(${SECMGR_LIBRARY_DIRS})
 	add_definitions(-DSIMULATE_SECURITY_MANAGER=0)
 endif(SIMULATE_SECMGR)
 
@@ -75,6 +96,7 @@ else(SIMULATE_SMACK)
 	add_compile_options(${SMACK_CFLAGS})
 	include_directories(${SMACK_INCLUDE_DIRS})
 	link_libraries(${SMACK_LIBRARIES})
+	link_directories(${SMACK_LIBRARY_DIRS})
 	add_definitions(-DSIMULATE_LIBSMACK=0)
 endif(SIMULATE_SMACK)
 
@@ -100,6 +122,7 @@ add_library(utils STATIC
 	utils-dir.c
 	utils-file.c
 	utils-json.c
+	utils-systemd.c
 	verbose.c
 	)
 
@@ -115,8 +138,13 @@ add_library(secwrp STATIC
 	secmgr-wrap.c
 	)
 
+add_library(afm STATIC
+	afm-udb.c
+	afm-urun.c
+	)
+
 ###########################################################################
-# packaging tools
+# off line tools tools
 
 MESSAGE(STATUS "Creating packaging tools")
 
@@ -135,64 +163,34 @@ 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
-		)
-
-	###########################################################################
-	# the daemons
+# dynamic tool daemons
+
+if(libsystemd_FOUND AND AFB_FOUND)
 	MESSAGE(STATUS "Creating daemons")
 
-	add_executable(afm-user-daemon afm-user-daemon.c)
-	target_link_libraries(afm-user-daemon afm secwrp wgt utils utils2)
-	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)
-	install(TARGETS afm-system-daemon DESTINATION ${CMAKE_INSTALL_BINDIR})
-
-	###########################################################################
-	# the binding for afb
-
-	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
-		)
-		###############################################################
-		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})
-		set_target_properties(afm-main-binding PROPERTIES
-			PREFIX ""
-			LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/afm-main-binding.export-map"
-		)
-		install(TARGETS afm-main-binding LIBRARY DESTINATION ${afb_binding_install_dir})
-	else()
-		message(STATUS "Not creating the binding for AFB-DAEMON")
+	add_library(jbus STATIC utils-jbus.c)
+
+	if(LEGACY_USER_DAEMON)
+		add_executable(afm-user-daemon afm-user-daemon.c)
+		target_link_libraries(afm-user-daemon jbus utils)
+		install(TARGETS afm-user-daemon DESTINATION ${CMAKE_INSTALL_BINDIR})
 	endif()
 
-endif(EXTRA2_FOUND)
+	add_library(afm-binding MODULE afm-binding.c)
+	target_link_libraries(afm-binding wgtpkg wgt secwrp utils afm)
+	set_target_properties(afm-binding PROPERTIES
+		PREFIX ""
+		LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/afm-binding.export-map"
+	)
+	install(TARGETS afm-binding LIBRARY DESTINATION ${afm_libexecdir})
+
+	add_executable(afm-user-session afm-user-session.c)
+	install(TARGETS afm-user-session DESTINATION ${afm_libexecdir}
+			PERMISSIONS SETUID OWNER_READ OWNER_WRITE OWNER_EXECUTE
+					GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+else()
+	MESSAGE(STATUS "Not creating daemons")
+endif()
 
 ###########################################################################
 # the tests