X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=4ef001f0b6fc299fa7952730b3e2b9cc4d08c207;hb=refs%2Fchanges%2F69%2F20869%2F1;hp=1d5da5e82ed192ed9bef57709fc54d3ad505a8d5;hpb=5011060f04181acbb18babcc2017a2f0b6cfb853;p=src%2Fapp-framework-binder.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1d5da5e8..4ef001f0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,31 +26,21 @@ ADD_DEFINITIONS(-DINFER_EXTENSION)
 
 ############################################################################
 # TODO: improve below setting
-set(USE_SIG_MONITOR_DUMPSTACK ON CACHE BOOL "activate dump stack on error")
-set(USE_SIG_MONITOR_SIGNALS   ON CACHE BOOL "activate handling of signals")
-set(USE_SIG_MONITOR_FOR_CALL  ON CACHE BOOL "activate monitoring of calls")
-set(USE_SIG_MONITOR_TIMERS    ON CACHE BOOL "activate monitoring of call expiration")
+option(USE_SIG_MONITOR_DUMPSTACK "activate dump stack on error"           ON)
+option(USE_SIG_MONITOR_SIGNALS   "activate handling of signals"           ON)
+option(USE_SIG_MONITOR_FOR_CALL  "activate monitoring of calls"           ON)
+option(USE_SIG_MONITOR_TIMERS    "activate monitoring of call expiration" ON)
+option(WITH_AFB_HOOK             "include hooking"                        ON)
+option(WITH_AFB_TRACE            "include monitoring trace"               ON)
 
-if(USE_SIG_MONITOR_DUMPSTACK)
-  add_definitions(-DUSE_SIG_MONITOR_DUMPSTACK=1)
-else()
-  add_definitions(-DUSE_SIG_MONITOR_DUMPSTACK=0)
-endif()
-if(USE_SIG_MONITOR_SIGNALS)
-  add_definitions(-DUSE_SIG_MONITOR_SIGNALS=1)
-else()
-  add_definitions(-DUSE_SIG_MONITOR_SIGNALS=0)
-endif()
-if(USE_SIG_MONITOR_FOR_CALL)
-  add_definitions(-DUSE_SIG_MONITOR_FOR_CALL=1)
-else()
-  add_definitions(-DUSE_SIG_MONITOR_FOR_CALL=0)
-endif()
-if(USE_SIG_MONITOR_TIMERS)
-  add_definitions(-DUSE_SIG_MONITOR_TIMERS=1)
-else()
-  add_definitions(-DUSE_SIG_MONITOR_TIMERS=0)
-endif()
+add_definitions(
+  -DUSE_SIG_MONITOR_DUMPSTACK=$<BOOL:${USE_SIG_MONITOR_DUMPSTACK}>
+  -DUSE_SIG_MONITOR_SIGNALS=$<BOOL:${USE_SIG_MONITOR_SIGNALS}>
+  -DUSE_SIG_MONITOR_FOR_CALL=$<BOOL:${USE_SIG_MONITOR_FOR_CALL}>
+  -DUSE_SIG_MONITOR_TIMERS=$<BOOL:${USE_SIG_MONITOR_TIMERS}>
+  -DWITH_AFB_HOOK=$<BOOL:${WITH_AFB_HOOK}>
+  -DWITH_AFB_TRACE=$<BOOL:${WITH_AFB_TRACE}>
+)
 ############################################################################
 
 SET(AFB_LIB_SOURCES
@@ -62,11 +52,11 @@ SET(AFB_LIB_SOURCES
 	afb-api-v3.c
 	afb-api-ws.c
 	afb-apiset.c
+	afb-args.c
 	afb-auth.c
 	afb-autoset.c
 	afb-calls.c
 	afb-common.c
-	afb-config.c
 	afb-context.c
 	afb-cred.c
 	afb-debug.c
@@ -145,7 +135,7 @@ INSTALL(TARGETS afb-daemon
 # build and install afb-daemon
 ###########################################
 IF(INCLUDE_SUPERVISOR)
-	ADD_EXECUTABLE(afs-supervisor main-afs-supervisor.c afs-supervisor.c afs-discover.c afs-config.c)
+	ADD_EXECUTABLE(afs-supervisor main-afs-supervisor.c afs-supervisor.c afs-discover.c afs-args.c)
 	TARGET_LINK_LIBRARIES(afs-supervisor
 		afb-lib
 		${link_libraries}