X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=CMakeLists.txt;h=955f6b79b89b931888405b9cfffd6b459966cebb;hb=2a8d1d568fe97efa258d88e888c90490d246b350;hp=568eb42b2bc89bd5de41d4f461428bef0f1cc7be;hpb=8cbdf0a5cb4d9abf0684344a28746a21dfc36ac3;p=src%2Fapp-framework-binder.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 568eb42b..955f6b79 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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(PROJECT_VERSION "4.99-EERC1")
+SET(PROJECT_VERSION "5.0.0-EE")
 set(PROJECT_URL "https://gerrit.automotivelinux.org/gerrit/gitweb?p=src/app-framework-binder.git;a=summary")
 
 SET(LIBAFBWSC_VERSION "1.1")
@@ -52,6 +52,7 @@ add_compile_options(-Werror=implicit-function-declaration)
 add_compile_options(-ffunction-sections -fdata-sections)
 add_compile_options(-fPIC)
 add_compile_options(-g)
+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")
@@ -89,7 +90,6 @@ IF(cynara_FOUND)
 ENDIF(cynara_FOUND)
 
 IF(HAVE_LIBMAGIC AND libsystemd_FOUND AND libmicrohttpd_FOUND AND openssl_FOUND AND uuid_FOUND)
-  SET(WITH_BINDER TRUE)
   ADD_DEFINITIONS(-DUSE_MAGIC_MIME_TYPE)
 ELSE()
   IF(NOT HAVE_LIBMAGIC)
@@ -108,10 +108,9 @@ ELSE()
   IF(NOT uuid_FOUND)
     MESSAGE(WARNING "Dependency to 'uuid' is missing")
   ENDIF()
-  IF(NOT ALLOW_NO_BINDER)
-    MESSAGE(FATAL_ERROR "Can't compile the binder, either define ALLOW_NO_BINDER or install dependencies")
+  IF(NOT ONLY_DEVTOOLS)
+    MESSAGE(FATAL_ERROR "Can't compile the binder, either define ONLY_DEVTOOLS or install dependencies")
   ENDIF()
-  SET(WITH_BINDER FALSE)
 ENDIF()
 
 ADD_DEFINITIONS(-DAFB_VERSION="${PROJECT_VERSION}")
@@ -140,34 +139,41 @@ SET(link_libraries
 	-lrt
 	)
 
-SET(binding_install_dir ${CMAKE_INSTALL_FULL_LIBDIR}/afb)
+ADD_SUBDIRECTORY(src/devtools)
 
-###########################################################################
-# activates the monitoring by default
-if(INCLUDE_MONITORING AND WITH_BINDER)
-	add_definitions(-DWITH_MONITORING_OPTION)
-	INSTALL(DIRECTORY
-		${CMAKE_CURRENT_SOURCE_DIR}/test/monitoring
-		DESTINATION
-		${binding_install_dir}
+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
+	if(INCLUDE_MONITORING AND NOT ONLY_DEVTOOLS)
+		add_definitions(-DWITH_MONITORING_OPTION)
+		INSTALL(DIRECTORY
+			${CMAKE_CURRENT_SOURCE_DIR}/test/monitoring
+			DESTINATION
+			${binding_install_dir}
+		)
+	endif()
+
+	###########################################################################
+
+	ADD_SUBDIRECTORY(src)
+	ADD_SUBDIRECTORY(src/tests)
+	ADD_SUBDIRECTORY(include)
+	ADD_SUBDIRECTORY(bindings)
+
+	############################################################
+	# installs the pkgconfig files
+	CONFIGURE_FILE(afb-daemon.pc.in afb-daemon.pc @ONLY)
+	CONFIGURE_FILE(libafbwsc.pc.in libafbwsc.pc @ONLY)
+
+	INSTALL(FILES
+	    ${CMAKE_CURRENT_BINARY_DIR}/afb-daemon.pc
+	    ${CMAKE_CURRENT_BINARY_DIR}/libafbwsc.pc
+	    DESTINATION
+	    ${CMAKE_INSTALL_LIBDIR}/pkgconfig
 	)
-endif()
-
-###########################################################################
-
-ADD_SUBDIRECTORY(src)
-ADD_SUBDIRECTORY(include)
-ADD_SUBDIRECTORY(bindings)
-
-############################################################
-# installs the pkgconfig files
-CONFIGURE_FILE(afb-daemon.pc.in afb-daemon.pc @ONLY)
-CONFIGURE_FILE(libafbwsc.pc.in libafbwsc.pc @ONLY)
-
-INSTALL(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/afb-daemon.pc
-    ${CMAKE_CURRENT_BINARY_DIR}/libafbwsc.pc
-    DESTINATION
-    ${CMAKE_INSTALL_LIBDIR}/pkgconfig
-    )
 
+ENDIF()