CMAKE: refactor options

The option ALLOW_NO_BINDER is removed and the option
ONLY_DEVTOOLS is introduced.

Change-Id: Ia19eb977ee25a3871582605028fdef75e552363f
Signed-off-by: José Bollo <jose.bollo@iot.bzh>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 568eb42..541b639 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,7 +89,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 +107,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 +138,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()

diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt
index 509c6cb..4494e88 100644 (file)
--- a/bindings/CMakeLists.txt
+++ b/bindings/CMakeLists.txt
@@ -16,9 +16,7 @@
 # limitations under the License.
 ###########################################################################
 
-IF(WITH_BINDER)
 ADD_SUBDIRECTORY(intrinsics)
 ADD_SUBDIRECTORY(samples)
 ADD_SUBDIRECTORY(tutorial)
-ENDIF(WITH_BINDER)
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b8accc7..f0e1d44 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,20 +16,9 @@
 # limitations under the License.
 ###########################################################################
 
-if (NOT DEFINED ALLOW_NO_BINDER)
-    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)
-endif(ALLOW_NO_BINDER)
-
-INCLUDE(FindPkgConfig)
-
-ADD_SUBDIRECTORY(genskel)
-
-IF(WITH_BINDER)
-###########################################
-
-ADD_SUBDIRECTORY(tests)
+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}")
 # Always add INFER_EXTENSION (more details in afb-hreq.c)
@@ -122,7 +111,3 @@ TARGET_LINK_LIBRARIES(afb-client-demo
 INSTALL(TARGETS afb-client-demo
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
-###########################################
-ELSE(WITH_BINDER)
-  MESSAGE(WARNING "NOT compiling the binder! but tools are compiled")
-ENDIF(WITH_BINDER)

diff --git a/src/genskel/CMakeLists.txt b/src/devtools/CMakeLists.txt
similarity index 100%
rename from src/genskel/CMakeLists.txt
rename to src/devtools/CMakeLists.txt

diff --git a/src/genskel/exprefs.c b/src/devtools/exprefs.c
similarity index 100%
rename from src/genskel/exprefs.c
rename to src/devtools/exprefs.c

diff --git a/src/genskel/genskel.c b/src/devtools/genskel.c
similarity index 100%
rename from src/genskel/genskel.c
rename to src/devtools/genskel.c

diff --git a/src/genskel/json2c.c b/src/devtools/json2c.c
similarity index 100%
rename from src/genskel/json2c.c
rename to src/devtools/json2c.c

diff --git a/src/genskel/monitor-api.json b/src/devtools/monitor-api.json
similarity index 100%
rename from src/genskel/monitor-api.json
rename to src/devtools/monitor-api.json