X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=CMakeLists.txt;h=ebda48f0b0d9c59e24f5a5160d8f96ae95b53877;hb=6b2b09db8ee3cf88b09b59696d50b4fa2de79a72;hp=8bee10680481db8c573b9ff4dda1df798336e4b7;hpb=80c96d74b4ffe8df5d0567da52776a409b2483bf;p=src%2Fapp-framework-binder.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8bee1068..ebda48f0 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,7 @@ 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(AGLVERSION "6.90.0" CACHE STRING "Version of AGL")
+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")
 
@@ -39,12 +39,14 @@ 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")
@@ -61,12 +63,12 @@ add_compile_options(-Werror=maybe-uninitialized)
 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")
 
 ###########################################################################
@@ -86,7 +88,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)
@@ -95,10 +97,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)
@@ -159,6 +157,7 @@ IF(ONLY_DEVTOOLS)
 	MESSAGE(WARNING "Only DEVTOOLS are compiled, not the binder!")
 ELSE()
 	SET(binding_install_dir ${CMAKE_INSTALL_FULL_LIBDIR}/afb)
+	SET(install_datadir ${CMAKE_INSTALL_FULL_DATADIR}/af-binder)
 
 	###########################################################################
 	# activates the monitoring by default