X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fapp-framework-binder.git;a=blobdiff_plain;f=CMakeLists.txt;h=75a50dcf06a77441d6005447356eea3841550dc4;hp=d31e70c6848294c01124fb0c4f607e70f0796dad;hb=f3d1f19ae308cc0559728c0ccf6281cbce5ee37c;hpb=c4835ee2a1b46069e5addf6f8b023c2e66e3665b

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d31e70c6..75a50dcf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 ###########################################################################
-# Copyright (C) 2015-2018 "IoT.bzh"
+# Copyright (C) 2015-2019 "IoT.bzh"
 #
 # author: José Bollo <jose.bollo@iot.bzh>
 #
@@ -23,7 +23,8 @@ PROJECT(afb-daemon C CXX)
 SET(PROJECT_NAME "AFB Daemon")
 SET(PROJECT_PRETTY_NAME "Application Framework Binder Daemon")
 SET(PROJECT_DESCRIPTION "Secured binder of API for clients of the Application framework")
-SET(PROJECT_VERSION "5.99.FFRC4")
+set(AGLVERSION "8.0.0" CACHE STRING "Version of AGL")
+set(PROJECT_VERSION ${AGLVERSION} CACHE STRING "Version of the project can override AGLVERSION")
 set(PROJECT_URL "https://gerrit.automotivelinux.org/gerrit/gitweb?p=src/app-framework-binder.git;a=summary")
 
 SET(LIBAFBWSC_VERSION "1.1")
@@ -38,16 +39,20 @@ INCLUDE(CTest)
 ###########################################################################
 # possible settings
 
-set(AGL_DEVEL OFF CACHE BOOL "Activates developping features")
-set(INCLUDE_MONITORING OFF CACHE BOOL "Activates installation of monitoring")
-set(INCLUDE_SUPERVISOR OFF CACHE BOOL "Activates installation of supervisor")
-set(INCLUDE_DBUS_TRANSPARENCY OFF CACHE BOOL "Allows API transparency over DBUS")
-set(INCLUDE_LEGACY_BINDING_V1 OFF CACHE BOOL "Includes the legacy Binding API version 1")
-set(INCLUDE_LEGACY_BINDING_VDYN OFF CACHE BOOL "Includes the legacy Binding API version dynamic")
+option(AGL_DEVEL                   "Activates developping features" OFF)
+option(INCLUDE_MONITORING          "Activates installation of monitoring" OFF)
+
+option(INCLUDE_SUPERVISOR          "Activates installation of supervisor" OFF)
+option(INCLUDE_DBUS_TRANSPARENCY   "Allows API transparency over DBUS" OFF)
+option(INCLUDE_LEGACY_BINDING_V1   "Includes the legacy Binding API version 1" OFF)
+option(INCLUDE_LEGACY_BINDING_VDYN "Includes the legacy Binding API version dynamic" OFF)
+
 set(AFS_SUPERVISION_SOCKET "@urn:AGL:afs:supervision:socket" CACHE STRING "Internal socket for supervision")
 set(AFS_SUPERVISOR_PORT 1619 CACHE STRING "Port of service for the supervisor")
 set(AFS_SUPERVISOR_TOKEN HELLO CACHE STRING "Secret token for the supervisor")
 set(UNITDIR_SYSTEM ${CMAKE_INSTALL_LIBDIR}/systemd/system CACHE STRING "Path to systemd system unit files")
+set(INTRINSIC_BINDING_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/afb CACHE STRING "Path to install intrinsic bindings")
+set(SAMPLE_INSTALL_DIR ${CMAKE_INSTALL_FULL_DATADIR}/af-binder CACHE STRING "Path to install samples")
 
 ###########################################################################
 
@@ -56,16 +61,20 @@ link_libraries(-Wl,--as-needed -Wl,--gc-sections -Wl,--no-undefined)
 add_compile_options(-Wall -Wextra -Wconversion)
 add_compile_options(-Wno-unused-parameter) # frankly not using a parameter does it care?
 add_compile_options(-Wno-sign-compare -Wno-sign-conversion)
-add_compile_options(-Werror=maybe-uninitialized)
+if (${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
+	add_compile_options(-Werror=maybe-uninitialized)
+elseif(${CMAKE_C_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+	add_compile_options(-Werror=sometimes-uninitialized)
+endif()
 add_compile_options(-Werror=implicit-function-declaration)
 add_compile_options(-ffunction-sections -fdata-sections)
 add_compile_options(-fPIC)
-add_compile_options(-g)
+add_compile_options(-g -O2)
 set (CMAKE_CXX_STANDARD 14)
 
-set(CMAKE_C_FLAGS_PROFILING    "-g -O2 -pg -Wp,-U_FORTIFY_SOURCE")
-set(CMAKE_C_FLAGS_DEBUG        "-g -ggdb -Wp,-U_FORTIFY_SOURCE")
-set(CMAKE_C_FLAGS_RELEASE      "-g -O2")
+set(CMAKE_C_FLAGS_PROFILING    "-g -O2 -pg -U_FORTIFY_SOURCE")
+set(CMAKE_C_FLAGS_DEBUG        "-g -O2 -ggdb -U_FORTIFY_SOURCE")
+set(CMAKE_C_FLAGS_RELEASE      "-g -O3")
 set(CMAKE_C_FLAGS_CCOV         "-g -O2 --coverage")
 
 ###########################################################################
@@ -85,7 +94,7 @@ IF(HAVE_MAGIC_H)
 ENDIF(HAVE_MAGIC_H)
 
 PKG_CHECK_MODULES(libsystemd libsystemd>=222)
-PKG_CHECK_MODULES(libmicrohttpd libmicrohttpd>=0.9.55)
+PKG_CHECK_MODULES(libmicrohttpd libmicrohttpd>=0.9.60)
 PKG_CHECK_MODULES(openssl openssl)
 PKG_CHECK_MODULES(uuid uuid)
 PKG_CHECK_MODULES(cynara cynara-client)
@@ -94,10 +103,6 @@ ADD_DEFINITIONS("-DAFS_SUPERVISION_SOCKET=\"${AFS_SUPERVISION_SOCKET}\"")
 ADD_DEFINITIONS("-DAFS_SUPERVISOR_TOKEN=\"${AFS_SUPERVISOR_TOKEN}\"")
 ADD_DEFINITIONS("-DAFS_SUPERVISOR_PORT=${AFS_SUPERVISOR_PORT}")
 
-IF(AGL_DEVEL)
-	ADD_DEFINITIONS(-DAGL_DEVEL)
-ENDIF()
-
 IF(cynara_FOUND)
 	ADD_DEFINITIONS(-DBACKEND_PERMISSION_IS_CYNARA)
 ENDIF(cynara_FOUND)
@@ -157,7 +162,6 @@ ADD_SUBDIRECTORY(src/devtools)
 IF(ONLY_DEVTOOLS)
 	MESSAGE(WARNING "Only DEVTOOLS are compiled, not the binder!")
 ELSE()
-	SET(binding_install_dir ${CMAKE_INSTALL_FULL_LIBDIR}/afb)
 
 	###########################################################################
 	# activates the monitoring by default
@@ -166,7 +170,7 @@ ELSE()
 		INSTALL(DIRECTORY
 			${CMAKE_CURRENT_SOURCE_DIR}/test/monitoring
 			DESTINATION
-			${binding_install_dir}
+			${INTRINSIC_BINDING_DIR}
 		)
 	endif()
 
@@ -194,6 +198,8 @@ ENDIF()
 IF(INCLUDE_SUPERVISOR)
 	CONFIGURE_FILE(afs-supervisor.service.in afs-supervisor.service @ONLY)
 	INSTALL(FILES
+	    ${CMAKE_CURRENT_SOURCE_DIR}/afm-api-supervisor.service
+	    ${CMAKE_CURRENT_SOURCE_DIR}/afm-api-supervisor.socket
 	    ${CMAKE_CURRENT_BINARY_DIR}/afs-supervisor.service
 	    DESTINATION
 	    ${UNITDIR_SYSTEM}