CMakeLists.txt

@@ -43,18 +43,18 @@ endif()
 
 set(FSFW_OSAL_DEFINITION FSFW_HOST)
 
-if(OS_FSFW MATCHES host)
+if(FSFW_OSAL MATCHES host)
 	set(OS_FSFW_NAME "Host")
-elseif(OS_FSFW MATCHES linux)
+elseif(FSFW_OSAL MATCHES linux)
 	set(OS_FSFW_NAME "Linux")
 	set(FSFW_OSAL_DEFINITION FSFW_LINUX)
-elseif(OS_FSFW MATCHES freertos)
+elseif(FSFW_OSAL MATCHES freertos)
 	set(OS_FSFW_NAME "FreeRTOS")
 	set(FSFW_OSAL_DEFINITION FSFW_FREERTOS)
 	target_link_libraries(${LIB_FSFW_NAME} PRIVATE
         ${LIB_OS_NAME}
 	)
-elseif(${OS_FSFW} STREQUAL rtems)
+elseif(FSFW_OSAL STREQUAL rtems)
 	set(OS_FSFW_NAME "RTEMS")
     set(FSFW_OSAL_DEFINITION FSFW_RTEMS)
 else()
@@ -75,50 +75,7 @@ target_compile_definitions(${LIB_FSFW_NAME} INTERFACE
 
 message(STATUS "Compiling FSFW for the ${OS_FSFW_NAME} operating system.")
 
-add_subdirectory(action)
+add_subdirectory(src)
-add_subdirectory(container)
-add_subdirectory(controller)
-add_subdirectory(coordinates)
-
-if(FSFW_USE_DATALINKLAYER)
-	add_subdirectory(datalinklayer)
-endif()
-
-add_subdirectory(datapool)
-add_subdirectory(datapoollocal)
-add_subdirectory(housekeeping)
-add_subdirectory(devicehandlers)
-add_subdirectory(events)
-add_subdirectory(fdir)
-add_subdirectory(globalfunctions)
-add_subdirectory(health)
-add_subdirectory(internalError)
-add_subdirectory(ipc)
-add_subdirectory(memory)
-add_subdirectory(modes)
-add_subdirectory(monitoring)
-add_subdirectory(objectmanager)
-add_subdirectory(osal)
-add_subdirectory(parameters)
-add_subdirectory(power)
-add_subdirectory(pus)
-
-if(FSFW_USE_RMAP)
-	add_subdirectory(rmap)
-endif()
-
-add_subdirectory(serialize)
-add_subdirectory(serviceinterface)
-add_subdirectory(storagemanager)
-add_subdirectory(subsystem)
-add_subdirectory(tasks)
-add_subdirectory(tcdistribution)
-add_subdirectory(thermal)
-add_subdirectory(timemanager)
-add_subdirectory(tmstorage)
-add_subdirectory(tmtcpacket)
-add_subdirectory(tmtcservices)
-add_subdirectory(unittest)
 
 # The project CMakeLists file has to set the FSFW_CONFIG_PATH and add it.
 # If this is not given, we include the default configuration and emit a warning.

src/CMakeLists.txt

@@ -0,0 +1,5 @@
+add_subdirectory(core)
+add_subdirectory(hal)
+add_subdirectory(opt)
+add_subdirectory(osal)
+# add_subdirectory(tests)

src/core/CMakeLists.txt

@@ -0,0 +1,29 @@
+add_subdirectory(action)
+add_subdirectory(container)
+add_subdirectory(controller)
+add_subdirectory(datapool)
+add_subdirectory(datapoollocal)
+add_subdirectory(devicehandlers)
+add_subdirectory(events)
+add_subdirectory(fdir)
+add_subdirectory(globalfunctions)
+add_subdirectory(health)
+add_subdirectory(housekeeping)
+add_subdirectory(internalError)
+add_subdirectory(ipc)
+add_subdirectory(memory)
+add_subdirectory(modes)
+add_subdirectory(objectmanager)
+add_subdirectory(parameters)
+add_subdirectory(power)
+add_subdirectory(serialize)
+add_subdirectory(serviceinterface)
+add_subdirectory(storagemanager)
+add_subdirectory(subsystem)
+add_subdirectory(tasks)
+add_subdirectory(tcdistribution)
+add_subdirectory(thermal)
+add_subdirectory(timemanager)
+add_subdirectory(tmstorage)
+add_subdirectory(tmtcpacket)
+add_subdirectory(tmtcservices)

src/opt/CMakeLists.txt

@@ -0,0 +1,6 @@
+add_subdirectory(coordinates)
+add_subdirectory(datalinklayer)
+add_subdirectory(monitoring)
+add_subdirectory(pus)
+add_subdirectory(rmap)
+add_subdirectory(tmstorage)

src/osal/CMakeLists.txt

@@ -1,11 +1,11 @@
 # Check the OS_FSFW variable
-if(${OS_FSFW} STREQUAL "freertos")
+if(FSFW_OSAL MATCHES "freertos")
     add_subdirectory(FreeRTOS)
-elseif(${OS_FSFW} STREQUAL "rtems")
+elseif(FSFW_OSAL MATCHES "rtems")
     add_subdirectory(rtems)
-elseif(${OS_FSFW} STREQUAL "linux")
+elseif(FSFW_OSAL MATCHES "linux")
     add_subdirectory(linux)
-elseif(${OS_FSFW} STREQUAL "host")
+elseif(FSFW_OSAL MATCHES "host")
     add_subdirectory(host)
     if (WIN32)
         add_subdirectory(windows)