X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=ee0adb442fd5175579f4a1015ab004eaea9f01a2;hb=6f13ad1989875b5a0ce50b24211fd1fba093735f;hp=58870aa41908ff71e1c93d7c25cbb1e7a6e5f4d6;hpb=2ba7c200c6c4844b63f8f707a6f04017661f16ca;p=src%2Fapp-framework-binder.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 58870aa4..ee0adb44 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,12 +20,12 @@ if (CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9)
     message(FATAL_ERROR "Require at least gcc-4.9")
 endif(CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9)
 
-ADD_DEFINITIONS(-DBINDING_INSTALL_DIR="${binding_install_dir}")
+ADD_DEFINITIONS(-DINTRINSIC_BINDING_DIR="${INTRINSIC_BINDING_DIR}")
 # Always add INFER_EXTENSION (more details in afb-hreq.c)
 ADD_DEFINITIONS(-DINFER_EXTENSION)
 
 ############################################################################
-# TODO: improve below setting
+# TODO: improve below setting by using config file
 option(WITH_SIG_MONITOR_DUMPSTACK "activate dump stack on error"           ON)
 option(WITH_SIG_MONITOR_SIGNALS   "activate handling of signals"           ON)
 option(WITH_SIG_MONITOR_FOR_CALL  "activate monitoring of calls"           ON)
@@ -35,7 +35,9 @@ option(WITH_AFB_TRACE             "include monitoring trace"               ON)
 option(WITH_SUPERVISOR            "Activates installation of supervisor"   OFF)
 option(WITH_DBUS_TRANSPARENCY     "Allows API transparency over DBUS"      OFF)
 option(WITH_LEGACY_BINDING_V1     "Includes the legacy Binding API version 1" OFF)
+option(WITH_LEGACY_BINDING_V2     "Includes the legacy Binding API version 2" ON)
 option(WITH_LEGACY_BINDING_VDYN   "Includes the legacy Binding API version dynamic" OFF)
+option(WITH_DYNAMIC_BINDING       "Allow to load dynamic bindings (shared libraries)" ON)
 
 if(INCLUDE_SUPERVISOR)
   set(WITH_SUPERVISOR ON)
@@ -51,6 +53,7 @@ if(INCLUDE_LEGACY_BINDING_VDYN)
 endif()
 
 add_definitions(
+  -DAGL_DEVEL=$<BOOL:${AGL_DEVEL}>
   -DWITH_SIG_MONITOR_DUMPSTACK=$<BOOL:${WITH_SIG_MONITOR_DUMPSTACK}>
   -DWITH_SIG_MONITOR_SIGNALS=$<BOOL:${WITH_SIG_MONITOR_SIGNALS}>
   -DWITH_SIG_MONITOR_FOR_CALL=$<BOOL:${WITH_SIG_MONITOR_FOR_CALL}>
@@ -58,9 +61,11 @@ add_definitions(
   -DWITH_AFB_HOOK=$<BOOL:${WITH_AFB_HOOK}>
   -DWITH_AFB_TRACE=$<BOOL:${WITH_AFB_TRACE}>
   -DWITH_LEGACY_BINDING_V1=$<BOOL:${INCLUDE_LEGACY_BINDING_V1}>
+  -DWITH_LEGACY_BINDING_V2=$<BOOL:${WITH_LEGACY_BINDING_V2}>
   -DWITH_LEGACY_BINDING_VDYN=$<BOOL:${INCLUDE_LEGACY_BINDING_VDYN}>
   -DWITH_DBUS_TRANSPARENCY=$<BOOL:${INCLUDE_DBUS_TRANSPARENCY}>
   -DWITH_SUPERVISION=$<BOOL:${INCLUDE_SUPERVISOR}>
+  -DWITH_DYNAMIC_BINDING=$<BOOL:${WITH_DYNAMIC_BINDING}>
 )
 ############################################################################
 
@@ -118,6 +123,7 @@ SET(AFB_LIB_SOURCES
 	sig-monitor.c
 	subpath.c
 	systemd.c
+	uuid.c
 	verbose.c
 	watchdog.c
 	websock.c