CMake: delete subdir CMakeLists; use one CMakeList for smocore

smocore/CMakeLists.txt

@@ -1,22 +1,42 @@
-# Core library
+# Include Flex/Bison generation rules
+include(${CMAKE_SOURCE_DIR}/cmake/flexYacc.cmake)
+
+# Consolidated smocore library with all source files
 add_library(smocore STATIC
+    # Core files
     mind.cpp
     opts.cpp
     componentThread.cpp
     component.cpp
+    painfulQuale.cpp
+
+    # Body
     body/body.cpp
+
+    # Marionette
+    marionette/main.cpp
+    marionette/salmanoff.cpp
+    marionette/lifetime.cpp
+    marionette/qualeEvent.cpp
+
+    # DeviceManager
+    deviceManager/deviceManager.cpp
+    deviceManager/deviceAttachmentPipeSpecParser.cpp
+    ${LEX_OUTPUT}
+    ${YACC_OUTPUT}
+
+    # SenseApis
+    senseApis/senseApiManager.cpp
+
+    # MindManager
+    mindManager/mindManager.cpp
 )
 
 target_include_directories(smocore PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${CMAKE_CURRENT_BINARY_DIR}
 )
 
 # Link against pthread for CPU affinity functions
 find_package(Threads REQUIRED)
-target_link_libraries(smocore
-	PRIVATE Threads::Threads senseApis mindManager)
-
-add_subdirectory(marionette)
-add_subdirectory(deviceManager)
-add_subdirectory(senseApis)
-add_subdirectory(mindManager)
+target_link_libraries(smocore PRIVATE Threads::Threads)

smocore/deviceManager/CMakeLists.txt

@@ -1,29 +0,0 @@
-# Flex/Bison generated files
-set(LEX_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/deviceAttachmentPipeSpecl.cc)
-set(YACC_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/deviceAttachmentPipeSpecp.cc)
-set(YACC_HEADER ${CMAKE_CURRENT_BINARY_DIR}/deviceAttachmentPipeSpecp.hh)
-
-# Generate Flex/Bison files using custom commands
-add_custom_command(
-    OUTPUT ${LEX_OUTPUT}
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/deviceAttachmentPipeSpecl.ll ${YACC_HEADER}
-    COMMAND ${FLEX_EXECUTABLE} --header-file=${CMAKE_CURRENT_BINARY_DIR}/deviceAttachmentPipeSpecl.hh -o ${LEX_OUTPUT} ${CMAKE_CURRENT_SOURCE_DIR}/deviceAttachmentPipeSpecl.ll
-    COMMENT "Generating deviceAttachmentPipeSpecl.cc from deviceAttachmentPipeSpecl.ll"
-)
-
-add_custom_command(
-    OUTPUT ${YACC_OUTPUT} ${YACC_HEADER}
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/deviceAttachmentPipeSpecp.yy
-    COMMAND ${BISON_EXECUTABLE} -p deviceAttachmentPipeSpecp --header=${YACC_HEADER} -o ${YACC_OUTPUT} ${CMAKE_CURRENT_SOURCE_DIR}/deviceAttachmentPipeSpecp.yy
-    COMMENT "Generating deviceAttachmentPipeSpecp.cc and deviceAttachmentPipeSpecp.hh from deviceAttachmentPipeSpecp.yy"
-)
-
-# Device manager library
-add_library(deviceManager STATIC
-    deviceManager.cpp
-    deviceAttachmentPipeSpecParser.cpp
-    ${LEX_OUTPUT}
-    ${YACC_OUTPUT}
-)
-
-target_include_directories(deviceManager PUBLIC ${CMAKE_CURRENT_BINARY_DIR})

smocore/marionette/CMakeLists.txt

@@ -1,15 +0,0 @@
-add_library(marionette STATIC
-    main.cpp
-    salmanoff.cpp
-    lifetime.cpp
-)
-
-target_link_libraries(marionette
-    smocore
-    mindManager
-)
-
-target_include_directories(marionette PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/../include
-)

smocore/mindManager/CMakeLists.txt

@@ -1,12 +0,0 @@
-add_library(mindManager STATIC
-    mindManager.cpp
-)
-
-target_include_directories(mindManager PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/../include
-)
-
-target_link_libraries(mindManager
-    smocore
-)

smocore/senseApis/CMakeLists.txt

@@ -1,5 +0,0 @@
-add_library(senseApis STATIC
-    senseApiManager.cpp
-)
-
-target_include_directories(senseApis PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)