CMake: Check for libDl, conditionally check for libXCB

hcore/CMakeLists.txt

@@ -9,11 +9,6 @@ target_include_directories(hcore PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/include
 )
 
-# Device manager (with Flex/Bison)
 add_subdirectory(deviceManager)
-
-# Sense APIs
 add_subdirectory(senseApis)
-
-# Marionette
-add_subdirectory(marionette) 
+add_subdirectory(marionette)

hcore/deviceManager/CMakeLists.txt

@@ -6,15 +6,15 @@ set(YACC_HEADER ${CMAKE_CURRENT_BINARY_DIR}/deviceSpecp.hh)
 # Generate Flex/Bison files using custom commands
 add_custom_command(
     OUTPUT ${LEX_OUTPUT}
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/deviceSpecl.ll ${YACC_HEADER}
     COMMAND ${FLEX_EXECUTABLE} --header-file=${CMAKE_CURRENT_BINARY_DIR}/deviceSpecl.hh -o ${LEX_OUTPUT} ${CMAKE_CURRENT_SOURCE_DIR}/deviceSpecl.ll
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/deviceSpecl.ll
     COMMENT "Generating deviceSpecl.cc from deviceSpecl.ll"
 )
 
 add_custom_command(
     OUTPUT ${YACC_OUTPUT} ${YACC_HEADER}
-    COMMAND ${BISON_EXECUTABLE} -p deviceSpecp --header=${YACC_HEADER} -o ${YACC_OUTPUT} ${CMAKE_CURRENT_SOURCE_DIR}/deviceSpecp.yy
     DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/deviceSpecp.yy
+    COMMAND ${BISON_EXECUTABLE} -p deviceSpecp --header=${YACC_HEADER} -o ${YACC_OUTPUT} ${CMAKE_CURRENT_SOURCE_DIR}/deviceSpecp.yy
     COMMENT "Generating deviceSpecp.cc and deviceSpecp.hh from deviceSpecp.yy"
 )
 
@@ -26,6 +26,4 @@ add_library(deviceManager STATIC
     ${YACC_OUTPUT}
 )
 
-target_include_directories(deviceManager PUBLIC
-    ${CMAKE_CURRENT_BINARY_DIR}
-) 
+target_include_directories(deviceManager PUBLIC ${CMAKE_CURRENT_BINARY_DIR})

hcore/marionette/CMakeLists.txt

@@ -4,4 +4,4 @@ add_library(marionette STATIC
 
 target_include_directories(marionette PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/include
-) 
+)

hcore/senseApis/CMakeLists.txt

@@ -2,6 +2,4 @@ add_library(senseApis STATIC
     senseApiManager.cpp
 )
 
-target_include_directories(senseApis PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-) 
+target_include_directories(senseApis PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)