apply cmake-fmt on all cmakelists.txt files

scripts/auto-formatter.sh

@@ -4,9 +4,10 @@ if [[ ! -f README.md ]]; then
 fi
 
 cmake_fmt="cmake-format"
+file_selectors="-iname CMakeLists.txt"
 if command -v ${cmake_fmt} &> /dev/null; then
-  cmake_fmt_cmd="${cmake_fmt} -i CMakeLists.txt"
+  ${cmake_fmt} -i CMakeLists.txt
-  eval ${cmake_fmt_cmd}
+  find ./src ${file_selectors} | xargs ${cmake_fmt}  -i
 else
   echo "No ${cmake_fmt} tool found, not formatting CMake files"
 fi
@@ -14,9 +15,9 @@ fi
 cpp_format="clang-format"
 file_selectors="-iname *.h -o -iname *.cpp -o -iname *.c -o -iname *.tpp"
 if command -v ${cpp_format} &> /dev/null; then
-  find ./src ${file_selectors} | xargs clang-format --style=file -i
+  find ./src ${file_selectors} | xargs ${cpp_format} --style=file -i
-  find ./hal ${file_selectors} | xargs clang-format --style=file -i
+  find ./hal ${file_selectors} | xargs ${cpp_format} --style=file -i
-  find ./tests ${file_selectors} | xargs clang-format --style=file -i
+  find ./tests ${file_selectors} | xargs ${cpp_format} --style=file -i
 else
   echo "No ${cpp_format} tool found, not formatting C++/C files"
 fi

src/CMakeLists.txt

@@ -1,9 +1,6 @@
-target_include_directories(${LIB_FSFW_NAME} PRIVATE
+target_include_directories(${LIB_FSFW_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-    ${CMAKE_CURRENT_SOURCE_DIR}
-)
 
-target_include_directories(${LIB_FSFW_NAME} INTERFACE
+target_include_directories(${LIB_FSFW_NAME}
-    ${CMAKE_CURRENT_SOURCE_DIR}
+                           INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
-)
 
 add_subdirectory(fsfw)

src/fsfw/CMakeLists.txt

@@ -1,6 +1,4 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(${LIB_FSFW_NAME} PRIVATE version.cpp)
-    version.cpp
-)
 
 # Core
 
@@ -37,22 +35,22 @@ add_subdirectory(tmtcservices)
 # Optional
 
 if(FSFW_ADD_MONITORING)
-add_subdirectory(monitoring)
+  add_subdirectory(monitoring)
 endif()
 if(FSFW_ADD_PUS)
-    add_subdirectory(pus)
+  add_subdirectory(pus)
 endif()
 if(FSFW_ADD_TMSTORAGE)
-    add_subdirectory(tmstorage)
+  add_subdirectory(tmstorage)
 endif()
 if(FSFW_ADD_COORDINATES)
-    add_subdirectory(coordinates)
+  add_subdirectory(coordinates)
 endif()
 if(FSFW_ADD_RMAP)
-    add_subdirectory(rmap)
+  add_subdirectory(rmap)
 endif()
 if(FSFW_ADD_DATALINKLAYER)
-    add_subdirectory(datalinklayer)
+  add_subdirectory(datalinklayer)
 endif()
 
 # OSAL

src/fsfw/action/CMakeLists.txt

@@ -1,7 +1,3 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-    PRIVATE 
+  ${LIB_FSFW_NAME} PRIVATE ActionHelper.cpp ActionMessage.cpp
-        ActionHelper.cpp
+                           CommandActionHelper.cpp SimpleActionHelper.cpp)
-        ActionMessage.cpp
-        CommandActionHelper.cpp
-        SimpleActionHelper.cpp
-)

src/fsfw/cfdp/CMakeLists.txt

@@ -1,7 +1,4 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(${LIB_FSFW_NAME} PRIVATE CFDPHandler.cpp CFDPMessage.cpp)
-    CFDPHandler.cpp
-    CFDPMessage.cpp
-)
 
 add_subdirectory(pdu)
 add_subdirectory(tlv)

src/fsfw/cfdp/pdu/CMakeLists.txt

@@ -1,32 +1,30 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(
-    PduConfig.cpp
+  ${LIB_FSFW_NAME}
-    VarLenField.cpp
+  PRIVATE PduConfig.cpp
-    HeaderSerializer.cpp
+          VarLenField.cpp
-    HeaderDeserializer.cpp
+          HeaderSerializer.cpp
-    FileDirectiveDeserializer.cpp
+          HeaderDeserializer.cpp
-    FileDirectiveSerializer.cpp
+          FileDirectiveDeserializer.cpp
- 
+          FileDirectiveSerializer.cpp
-    AckInfo.cpp
+          AckInfo.cpp
-    AckPduSerializer.cpp
+          AckPduSerializer.cpp
-    AckPduDeserializer.cpp
+          AckPduDeserializer.cpp
-    EofInfo.cpp
+          EofInfo.cpp
-    EofPduSerializer.cpp
+          EofPduSerializer.cpp
-    EofPduDeserializer.cpp
+          EofPduDeserializer.cpp
-    NakInfo.cpp
+          NakInfo.cpp
-    NakPduSerializer.cpp
+          NakPduSerializer.cpp
-    NakPduDeserializer.cpp
+          NakPduDeserializer.cpp
-    FinishedInfo.cpp
+          FinishedInfo.cpp
-    FinishedPduSerializer.cpp
+          FinishedPduSerializer.cpp
-    FinishedPduDeserializer.cpp
+          FinishedPduDeserializer.cpp
-    MetadataInfo.cpp
+          MetadataInfo.cpp
-    MetadataPduSerializer.cpp
+          MetadataPduSerializer.cpp
-    MetadataPduDeserializer.cpp
+          MetadataPduDeserializer.cpp
-    KeepAlivePduSerializer.cpp
+          KeepAlivePduSerializer.cpp
-    KeepAlivePduDeserializer.cpp
+          KeepAlivePduDeserializer.cpp
-    PromptPduSerializer.cpp
+          PromptPduSerializer.cpp
-    PromptPduDeserializer.cpp
+          PromptPduDeserializer.cpp
-
+          FileDataSerializer.cpp
-    FileDataSerializer.cpp
+          FileDataDeserializer.cpp
-    FileDataDeserializer.cpp
+          FileDataInfo.cpp)
-    FileDataInfo.cpp
-)

src/fsfw/cfdp/tlv/CMakeLists.txt

@@ -1,10 +1,10 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(
-    EntityIdTlv.cpp
+  ${LIB_FSFW_NAME}
-    FilestoreRequestTlv.cpp
+  PRIVATE EntityIdTlv.cpp
-    FilestoreResponseTlv.cpp
+          FilestoreRequestTlv.cpp
-    Lv.cpp
+          FilestoreResponseTlv.cpp
-    Tlv.cpp
+          Lv.cpp
-    FlowLabelTlv.cpp
+          Tlv.cpp
-    MessageToUserTlv.cpp
+          FlowLabelTlv.cpp
-    FaultHandlerOverrideTlv.cpp
+          MessageToUserTlv.cpp
-)
+          FaultHandlerOverrideTlv.cpp)

src/fsfw/container/CMakeLists.txt

@@ -1,5 +1,2 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE SharedRingBuffer.cpp
-    PRIVATE 
+                                        SimpleRingBuffer.cpp)
-        SharedRingBuffer.cpp
-        SimpleRingBuffer.cpp
-)

src/fsfw/controller/CMakeLists.txt

@@ -1,4 +1,2 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE 
+target_sources(${LIB_FSFW_NAME} PRIVATE ControllerBase.cpp
-    ControllerBase.cpp
+                                        ExtendedControllerBase.cpp)
-    ExtendedControllerBase.cpp
-)

src/fsfw/coordinates/CMakeLists.txt

@@ -1,5 +1,2 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE CoordinateTransformations.cpp
-	PRIVATE 
+                                        Sgp4Propagator.cpp)
-		CoordinateTransformations.cpp
-		Sgp4Propagator.cpp
-)

src/fsfw/datalinklayer/CMakeLists.txt

@@ -1,12 +1,11 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-	PRIVATE 
+  ${LIB_FSFW_NAME}
-		Clcw.cpp
+  PRIVATE Clcw.cpp
-		DataLinkLayer.cpp
+          DataLinkLayer.cpp
-		Farm1StateLockout.cpp
+          Farm1StateLockout.cpp
-		Farm1StateOpen.cpp
+          Farm1StateOpen.cpp
-		Farm1StateWait.cpp
+          Farm1StateWait.cpp
-		MapPacketExtraction.cpp
+          MapPacketExtraction.cpp
-		TcTransferFrame.cpp
+          TcTransferFrame.cpp
-		TcTransferFrameLocal.cpp
+          TcTransferFrameLocal.cpp
-		VirtualChannelReception.cpp
+          VirtualChannelReception.cpp)
-)

src/fsfw/datapool/CMakeLists.txt

@@ -1,4 +1 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE 
+target_sources(${LIB_FSFW_NAME} PRIVATE PoolDataSetBase.cpp PoolEntry.cpp)
-    PoolDataSetBase.cpp
-    PoolEntry.cpp
-)

src/fsfw/datapoollocal/CMakeLists.txt

@@ -1,10 +1,6 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-	PRIVATE 
+  ${LIB_FSFW_NAME}
-		LocalDataPoolManager.cpp
+  PRIVATE LocalDataPoolManager.cpp LocalDataSet.cpp LocalPoolDataSetBase.cpp
-		LocalDataSet.cpp
+          LocalPoolObjectBase.cpp SharedLocalDataSet.cpp)
-		LocalPoolDataSetBase.cpp
-		LocalPoolObjectBase.cpp
-		SharedLocalDataSet.cpp
-)
 
 add_subdirectory(internal)

src/fsfw/datapoollocal/internal/CMakeLists.txt

@@ -1,5 +1,2 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE HasLocalDpIFUserAttorney.cpp
-	PRIVATE 
+                                        HasLocalDpIFManagerAttorney.cpp)
-		HasLocalDpIFUserAttorney.cpp
-		HasLocalDpIFManagerAttorney.cpp
-)

src/fsfw/devicehandlers/CMakeLists.txt

@@ -1,11 +1,10 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-	PRIVATE 
+  ${LIB_FSFW_NAME}
-		AssemblyBase.cpp
+  PRIVATE AssemblyBase.cpp
-		ChildHandlerBase.cpp
+          ChildHandlerBase.cpp
-		ChildHandlerFDIR.cpp
+          ChildHandlerFDIR.cpp
-		DeviceHandlerBase.cpp
+          DeviceHandlerBase.cpp
-		DeviceHandlerFailureIsolation.cpp
+          DeviceHandlerFailureIsolation.cpp
-		DeviceHandlerMessage.cpp
+          DeviceHandlerMessage.cpp
-		DeviceTmReportingWrapper.cpp
+          DeviceTmReportingWrapper.cpp
-		HealthDevice.cpp
+          HealthDevice.cpp)
-)

src/fsfw/events/CMakeLists.txt

@@ -1,6 +1,3 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE 
+target_sources(${LIB_FSFW_NAME} PRIVATE EventManager.cpp EventMessage.cpp)
-    EventManager.cpp
-    EventMessage.cpp
-)
 
 add_subdirectory(eventmatching)

src/fsfw/events/eventmatching/CMakeLists.txt

@@ -1,7 +1,3 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-	PRIVATE 
+  ${LIB_FSFW_NAME} PRIVATE EventIdRangeMatcher.cpp EventMatchTree.cpp
-		EventIdRangeMatcher.cpp
+                           ReporterRangeMatcher.cpp SeverityRangeMatcher.cpp)
-		EventMatchTree.cpp
-		ReporterRangeMatcher.cpp
-		SeverityRangeMatcher.cpp
-)

src/fsfw/fdir/CMakeLists.txt

@@ -1,6 +1,3 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-	PRIVATE 
+  ${LIB_FSFW_NAME} PRIVATE EventCorrelation.cpp FailureIsolationBase.cpp
-		EventCorrelation.cpp
+                           FaultCounter.cpp)
-		FailureIsolationBase.cpp
-		FaultCounter.cpp
-)

src/fsfw/globalfunctions/CMakeLists.txt

@@ -1,13 +1,13 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(
-    arrayprinter.cpp
+  ${LIB_FSFW_NAME}
-    AsciiConverter.cpp
+  PRIVATE arrayprinter.cpp
-    CRC.cpp
+          AsciiConverter.cpp
-    DleEncoder.cpp
+          CRC.cpp
-    DleParser.cpp
+          DleEncoder.cpp
-    PeriodicOperationDivider.cpp
+          DleParser.cpp
-    timevalOperations.cpp
+          PeriodicOperationDivider.cpp
-    Type.cpp
+          timevalOperations.cpp
-    bitutility.cpp
+          Type.cpp
-)
+          bitutility.cpp)
 
 add_subdirectory(math)

src/fsfw/globalfunctions/math/CMakeLists.txt

@@ -1,4 +1 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE QuaternionOperations.cpp)
-	PRIVATE 
-		QuaternionOperations.cpp
-)

src/fsfw/health/CMakeLists.txt

@@ -1,6 +1,2 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE HealthHelper.cpp HealthMessage.cpp
-	PRIVATE 
+                                        HealthTable.cpp)
-		HealthHelper.cpp
-		HealthMessage.cpp
-		HealthTable.cpp	
-)

src/fsfw/housekeeping/CMakeLists.txt

@@ -1,5 +1,2 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE HousekeepingMessage.cpp
-	PRIVATE 
+                                        PeriodicHousekeepingHelper.cpp)
-		HousekeepingMessage.cpp
-		PeriodicHousekeepingHelper.cpp
-)

src/fsfw/internalerror/CMakeLists.txt

@@ -1,4 +1 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE InternalErrorReporter.cpp)
-	PRIVATE 
-		InternalErrorReporter.cpp
-)

src/fsfw/ipc/CMakeLists.txt

@@ -1,6 +1,3 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(
-    CommandMessage.cpp
+  ${LIB_FSFW_NAME} PRIVATE CommandMessage.cpp CommandMessageCleaner.cpp
-    CommandMessageCleaner.cpp
+                           MessageQueueMessage.cpp MessageQueueBase.cpp)
-    MessageQueueMessage.cpp
-    MessageQueueBase.cpp
-)

src/fsfw/memory/CMakeLists.txt

@@ -1,5 +1,2 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(${LIB_FSFW_NAME} PRIVATE MemoryHelper.cpp MemoryMessage.cpp
-    MemoryHelper.cpp
+                                        GenericFileSystemMessage.cpp)
-    MemoryMessage.cpp
-    GenericFileSystemMessage.cpp
-)

src/fsfw/modes/CMakeLists.txt

@@ -1,5 +1 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE ModeHelper.cpp ModeMessage.cpp)
-	PRIVATE 
-		ModeHelper.cpp
-		ModeMessage.cpp
-)

src/fsfw/monitoring/CMakeLists.txt

@@ -1,5 +1,2 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE LimitViolationReporter.cpp
-	PRIVATE 
+                                        MonitoringMessage.cpp)
-		LimitViolationReporter.cpp
-		MonitoringMessage.cpp
-)

src/fsfw/objectmanager/CMakeLists.txt

@@ -1,5 +1 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE ObjectManager.cpp SystemObject.cpp)
-	PRIVATE 
-		ObjectManager.cpp
-		SystemObject.cpp
-)

src/fsfw/osal/CMakeLists.txt

@@ -1,34 +1,32 @@
 # Check the OS_FSFW variable
 if(FSFW_OSAL MATCHES "freertos")
-    add_subdirectory(freertos)
+  add_subdirectory(freertos)
 elseif(FSFW_OSAL MATCHES "rtems")
-    add_subdirectory(rtems)
+  add_subdirectory(rtems)
 elseif(FSFW_OSAL MATCHES "linux")
-    add_subdirectory(linux)
+  add_subdirectory(linux)
 elseif(FSFW_OSAL MATCHES "host")
-    add_subdirectory(host)
+  add_subdirectory(host)
-    if (WIN32)
+  if(WIN32)
-        add_subdirectory(windows)
+    add_subdirectory(windows)
-    elseif(UNIX)
+  elseif(UNIX)
-        # We still need to pull in some Linux specific sources
+    # We still need to pull in some Linux specific sources
-        target_sources(${LIB_FSFW_NAME} PUBLIC
+    target_sources(${LIB_FSFW_NAME} PUBLIC linux/tcpipHelpers.cpp)
-            linux/tcpipHelpers.cpp
+  endif()
-        )
-    endif ()
 
 else()
 
-    message(WARNING "The OS_FSFW variable was not set. Assuming host OS..")
+  message(WARNING "The OS_FSFW variable was not set. Assuming host OS..")
-    # Not set. Assumuing this is a host build, try to determine host OS
+  # Not set. Assumuing this is a host build, try to determine host OS
-    if (WIN32)
+  if(WIN32)
-        add_subdirectory(host)
+    add_subdirectory(host)
-        add_subdirectory(windows)
+    add_subdirectory(windows)
-    elseif (UNIX)
+  elseif(UNIX)
-        add_subdirectory(linux)
+    add_subdirectory(linux)
-    else ()
+  else()
-        # MacOS or other OSes have not been tested yet / are not supported.
+    # MacOS or other OSes have not been tested yet / are not supported.
-        message(FATAL_ERROR "The host OS could not be determined! Aborting.")
+    message(FATAL_ERROR "The host OS could not be determined! Aborting.")
-    endif()
+  endif()
 
 endif()
 

src/fsfw/osal/common/CMakeLists.txt

@@ -1,17 +1,10 @@
 if(DEFINED WIN32 OR DEFINED UNIX)
-    target_sources(${LIB_FSFW_NAME} PRIVATE 
+  target_sources(
-        tcpipCommon.cpp
+    ${LIB_FSFW_NAME}
-        TcpIpBase.cpp
+    PRIVATE tcpipCommon.cpp TcpIpBase.cpp UdpTcPollingTask.cpp
-        UdpTcPollingTask.cpp
+            UdpTmTcBridge.cpp TcpTmTcServer.cpp TcpTmTcBridge.cpp)
-        UdpTmTcBridge.cpp
-        TcpTmTcServer.cpp
-        TcpTmTcBridge.cpp
-    )
 endif()
 
 if(WIN32)
-    target_link_libraries(${LIB_FSFW_NAME} PRIVATE
+  target_link_libraries(${LIB_FSFW_NAME} PRIVATE wsock32 ws2_32)
-        wsock32 
-        ws2_32
-    )
 endif()

src/fsfw/osal/freertos/CMakeLists.txt

@@ -1,32 +1,30 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-	PRIVATE 
+  ${LIB_FSFW_NAME}
-		Clock.cpp
+  PRIVATE Clock.cpp
-		FixedTimeslotTask.cpp
+          FixedTimeslotTask.cpp
-		BinarySemaphore.cpp
+          BinarySemaphore.cpp
-		BinSemaphUsingTask.cpp
+          BinSemaphUsingTask.cpp
-		CountingSemaphore.cpp
+          CountingSemaphore.cpp
-		CountingSemaphUsingTask.cpp
+          CountingSemaphUsingTask.cpp
-		MessageQueue.cpp
+          MessageQueue.cpp
-		Mutex.cpp
+          Mutex.cpp
-		MutexFactory.cpp
+          MutexFactory.cpp
-		PeriodicTask.cpp
+          PeriodicTask.cpp
-		QueueFactory.cpp
+          QueueFactory.cpp
-		SemaphoreFactory.cpp
+          SemaphoreFactory.cpp
-		TaskFactory.cpp
+          TaskFactory.cpp
-		Timekeeper.cpp
+          Timekeeper.cpp
-		TaskManagement.cpp
+          TaskManagement.cpp
-		QueueMapManager.cpp
+          QueueMapManager.cpp)
-)
 
 # FreeRTOS is required to link the FSFW now. It is recommended to compile
 # FreeRTOS as a static library and set LIB_OS_NAME to the target name of the
 # library.
 if(NOT LIB_OS_NAME)
-	message(STATUS
+  message(
-		"LIB_OS_NAME is empty. Make sure to include the FreeRTOS header path properly."
+    STATUS
-	)
+      "LIB_OS_NAME is empty. Make sure to include the FreeRTOS header path properly."
+  )
 else()
-    target_link_libraries(${LIB_FSFW_NAME} PRIVATE
+  target_link_libraries(${LIB_FSFW_NAME} PRIVATE ${LIB_OS_NAME})
-        ${LIB_OS_NAME}
-    )
 endif()

src/fsfw/osal/host/CMakeLists.txt

@@ -1,27 +1,23 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(
-  Clock.cpp
+  ${LIB_FSFW_NAME}
-  FixedTimeslotTask.cpp
+  PRIVATE Clock.cpp
-  MessageQueue.cpp
+          FixedTimeslotTask.cpp
-  Mutex.cpp
+          MessageQueue.cpp
-  MutexFactory.cpp
+          Mutex.cpp
-  PeriodicTask.cpp
+          MutexFactory.cpp
-  QueueFactory.cpp
+          PeriodicTask.cpp
-  QueueMapManager.cpp
+          QueueFactory.cpp
-  SemaphoreFactory.cpp
+          QueueMapManager.cpp
-  TaskFactory.cpp
+          SemaphoreFactory.cpp
-  taskHelpers.cpp
+          TaskFactory.cpp
-)
+          taskHelpers.cpp)
 
 if(UNIX)
   find_package(Threads REQUIRED)
 
-  target_link_libraries(${LIB_FSFW_NAME} PRIVATE
+  target_link_libraries(${LIB_FSFW_NAME} PRIVATE ${CMAKE_THREAD_LIBS_INIT})
-    ${CMAKE_THREAD_LIBS_INIT}
-  )
   if(NOT APPLE)
-    target_link_libraries(${LIB_FSFW_NAME} PRIVATE
+    target_link_libraries(${LIB_FSFW_NAME} PRIVATE rt)
-      rt
-      )
   endif()
 
 endif()

src/fsfw/osal/linux/CMakeLists.txt

@@ -1,29 +1,25 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(
-  Clock.cpp
+  ${LIB_FSFW_NAME}
-  BinarySemaphore.cpp
+  PRIVATE Clock.cpp
-  CountingSemaphore.cpp
+          BinarySemaphore.cpp
-  FixedTimeslotTask.cpp
+          CountingSemaphore.cpp
-  InternalErrorCodes.cpp
+          FixedTimeslotTask.cpp
-  MessageQueue.cpp
+          InternalErrorCodes.cpp
-  Mutex.cpp
+          MessageQueue.cpp
-  MutexFactory.cpp
+          Mutex.cpp
-  PeriodicPosixTask.cpp
+          MutexFactory.cpp
-  PosixThread.cpp
+          PeriodicPosixTask.cpp
-  QueueFactory.cpp
+          PosixThread.cpp
-  SemaphoreFactory.cpp
+          QueueFactory.cpp
-  TaskFactory.cpp
+          SemaphoreFactory.cpp
-  tcpipHelpers.cpp
+          TaskFactory.cpp
-  unixUtility.cpp
+          tcpipHelpers.cpp
-  )
+          unixUtility.cpp)
 
 find_package(Threads REQUIRED)
 
-target_link_libraries(${LIB_FSFW_NAME} PUBLIC
+target_link_libraries(${LIB_FSFW_NAME} PUBLIC ${CMAKE_THREAD_LIBS_INIT})
-  ${CMAKE_THREAD_LIBS_INIT}
-  )
 
 if(NOT APPLE)
-  target_link_libraries(${LIB_FSFW_NAME} PUBLIC
+  target_link_libraries(${LIB_FSFW_NAME} PUBLIC rt)
-    rt
-  )
 endif()

src/fsfw/osal/rtems/CMakeLists.txt

@@ -1,20 +1,17 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-	PRIVATE 
+  ${LIB_FSFW_NAME}
-		Clock.cpp
+  PRIVATE Clock.cpp
-		CpuUsage.cpp
+          CpuUsage.cpp
-		InitTask.cpp
+          InitTask.cpp
-		InternalErrorCodes.cpp
+          InternalErrorCodes.cpp
-		MessageQueue.cpp
+          MessageQueue.cpp
-		PeriodicTask.cpp
+          PeriodicTask.cpp
-		Mutex.cpp
+          Mutex.cpp
-		MutexFactory.cpp
+          MutexFactory.cpp
-		FixedTimeslotTask.cpp
+          FixedTimeslotTask.cpp
-		QueueFactory.cpp
+          QueueFactory.cpp
-		RtemsBasic.cpp
+          RtemsBasic.cpp
-		RTEMSTaskBase.cpp
+          RTEMSTaskBase.cpp
-		TaskFactory.cpp
+          TaskFactory.cpp
-		BinarySemaphore.cpp
+          BinarySemaphore.cpp
-		SemaphoreFactory.cpp
+          SemaphoreFactory.cpp)
-)
-
-

src/fsfw/osal/windows/CMakeLists.txt

@@ -1,4 +1 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE 
+target_sources(${LIB_FSFW_NAME} PRIVATE tcpipHelpers.cpp winTaskHelpers.cpp)
-    tcpipHelpers.cpp
-    winTaskHelpers.cpp
-)

src/fsfw/parameters/CMakeLists.txt

@@ -1,6 +1,3 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-	PRIVATE 
+  ${LIB_FSFW_NAME} PRIVATE ParameterHelper.cpp ParameterMessage.cpp
-		ParameterHelper.cpp
+                           ParameterWrapper.cpp)
-		ParameterMessage.cpp
-		ParameterWrapper.cpp
-)

src/fsfw/power/CMakeLists.txt

@@ -1,8 +1,4 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(
-    Fuse.cpp
+  ${LIB_FSFW_NAME}
-    PowerComponent.cpp
+  PRIVATE Fuse.cpp PowerComponent.cpp PowerSensor.cpp PowerSwitcher.cpp
-    PowerSensor.cpp
+          DummyPowerSwitcher.cpp PowerSwitcherComponent.cpp)
-    PowerSwitcher.cpp
-    DummyPowerSwitcher.cpp
-    PowerSwitcherComponent.cpp
-)

src/fsfw/pus/CMakeLists.txt

@@ -1,12 +1,12 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE 
+target_sources(
-    Service1TelecommandVerification.cpp
+  ${LIB_FSFW_NAME}
-    Service2DeviceAccess.cpp
+  PRIVATE Service1TelecommandVerification.cpp
-    Service3Housekeeping.cpp
+          Service2DeviceAccess.cpp
-    Service5EventReporting.cpp
+          Service3Housekeeping.cpp
-    Service8FunctionManagement.cpp
+          Service5EventReporting.cpp
-    Service9TimeManagement.cpp
+          Service8FunctionManagement.cpp
-    Service17Test.cpp
+          Service9TimeManagement.cpp
-    Service20ParameterManagement.cpp
+          Service17Test.cpp
-    CService200ModeCommanding.cpp
+          Service20ParameterManagement.cpp
-    CService201HealthCommanding.cpp
+          CService200ModeCommanding.cpp
-)
+          CService201HealthCommanding.cpp)

src/fsfw/rmap/CMakeLists.txt

@@ -1,7 +1,2 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE RMAP.cpp RMAPCookie.cpp
-	PRIVATE 
+                                        RmapDeviceCommunicationIF.cpp)
-		RMAP.cpp
-		RMAPCookie.cpp
-		RmapDeviceCommunicationIF.cpp
-)
-

src/fsfw/serialize/CMakeLists.txt

@@ -1,4 +1 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE SerialBufferAdapter.cpp)
-	PRIVATE 
-		SerialBufferAdapter.cpp
-)

src/fsfw/serviceinterface/CMakeLists.txt

@@ -1,5 +1,4 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE 
+target_sources(
-	ServiceInterfaceStream.cpp
+  ${LIB_FSFW_NAME}
-	ServiceInterfaceBuffer.cpp
+  PRIVATE ServiceInterfaceStream.cpp ServiceInterfaceBuffer.cpp
-	ServiceInterfacePrinter.cpp
+          ServiceInterfacePrinter.cpp)
-)

src/fsfw/storagemanager/CMakeLists.txt

@@ -1,7 +1,3 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-	PRIVATE 
+  ${LIB_FSFW_NAME} PRIVATE ConstStorageAccessor.cpp StorageAccessor.cpp
-		ConstStorageAccessor.cpp
+                           LocalPool.cpp PoolManager.cpp)
-		StorageAccessor.cpp
-		LocalPool.cpp
-		PoolManager.cpp
-)

src/fsfw/subsystem/CMakeLists.txt

@@ -1,7 +1,3 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE Subsystem.cpp SubsystemBase.cpp)
-	PRIVATE 
-		Subsystem.cpp
-		SubsystemBase.cpp
-)
 
 add_subdirectory(modes)

src/fsfw/subsystem/modes/CMakeLists.txt

@@ -1,5 +1 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE ModeSequenceMessage.cpp ModeStore.cpp)
-	PRIVATE 
-		ModeSequenceMessage.cpp
-		ModeStore.cpp
-)

src/fsfw/tasks/CMakeLists.txt

@@ -1,5 +1,2 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE FixedSequenceSlot.cpp
-	PRIVATE 
+                                        FixedSlotSequence.cpp)
-		FixedSequenceSlot.cpp
-		FixedSlotSequence.cpp
-)

src/fsfw/tcdistribution/CMakeLists.txt

@@ -1,9 +1,4 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE 
+target_sources(
-    CCSDSDistributor.cpp
+  ${LIB_FSFW_NAME}
-    PUSDistributor.cpp
+  PRIVATE CCSDSDistributor.cpp PUSDistributor.cpp TcDistributor.cpp
-    TcDistributor.cpp
+          TcPacketCheckPUS.cpp TcPacketCheckCFDP.cpp CFDPDistributor.cpp)
-    TcPacketCheckPUS.cpp
-    TcPacketCheckCFDP.cpp
-    CFDPDistributor.cpp
-)
-

src/fsfw/thermal/CMakeLists.txt

@@ -1,10 +1,9 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-	PRIVATE 
+  ${LIB_FSFW_NAME}
-		AbstractTemperatureSensor.cpp
+  PRIVATE AbstractTemperatureSensor.cpp
-		Heater.cpp
+          Heater.cpp
-		RedundantHeater.cpp
+          RedundantHeater.cpp
-		ThermalComponentCore.cpp
+          ThermalComponentCore.cpp
-		ThermalComponent.cpp
+          ThermalComponent.cpp
-		ThermalModule.cpp
+          ThermalModule.cpp
-		ThermalMonitorReporter.cpp
+          ThermalMonitorReporter.cpp)
-)

src/fsfw/timemanager/CMakeLists.txt

@@ -1,8 +1,3 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(
-    CCSDSTime.cpp
+  ${LIB_FSFW_NAME} PRIVATE CCSDSTime.cpp Countdown.cpp Stopwatch.cpp
-    Countdown.cpp
+                           TimeMessage.cpp TimeStamper.cpp ClockCommon.cpp)
-    Stopwatch.cpp
-    TimeMessage.cpp
-    TimeStamper.cpp
-    ClockCommon.cpp
-)

src/fsfw/tmstorage/CMakeLists.txt

@@ -1,4 +1 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE TmStoreMessage.cpp)
-	PRIVATE 
-		TmStoreMessage.cpp
-)

src/fsfw/tmtcpacket/CMakeLists.txt

@@ -1,7 +1,4 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE 
+target_sources(${LIB_FSFW_NAME} PRIVATE SpacePacket.cpp SpacePacketBase.cpp)
-    SpacePacket.cpp
-    SpacePacketBase.cpp
-)
 
 add_subdirectory(cfdp)
 add_subdirectory(packetmatcher)

src/fsfw/tmtcpacket/cfdp/CMakeLists.txt

@@ -1,4 +1 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE    
+target_sources(${LIB_FSFW_NAME} PRIVATE CFDPPacket.cpp CFDPPacketStored.cpp)
-    CFDPPacket.cpp
-    CFDPPacketStored.cpp
-)

src/fsfw/tmtcpacket/packetmatcher/CMakeLists.txt

@@ -1,4 +1 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE PacketMatchTree.cpp)
-	PRIVATE 
-		PacketMatchTree.cpp
-)

src/fsfw/tmtcpacket/pus/tc/CMakeLists.txt

@@ -1,6 +1,3 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE    
+target_sources(
-    TcPacketPusBase.cpp
+  ${LIB_FSFW_NAME} PRIVATE TcPacketPusBase.cpp TcPacketPus.cpp
-    TcPacketPus.cpp
+                           TcPacketStoredBase.cpp TcPacketStoredPus.cpp)
-    TcPacketStoredBase.cpp
-    TcPacketStoredPus.cpp
-)

src/fsfw/tmtcpacket/pus/tm/CMakeLists.txt

@@ -1,9 +1,9 @@
-target_sources(${LIB_FSFW_NAME} PRIVATE
+target_sources(
-    TmPacketStoredPusA.cpp
+  ${LIB_FSFW_NAME}
-    TmPacketStoredPusC.cpp
+  PRIVATE TmPacketStoredPusA.cpp
-    TmPacketPusA.cpp
+          TmPacketStoredPusC.cpp
-    TmPacketPusC.cpp
+          TmPacketPusA.cpp
-    TmPacketStoredBase.cpp
+          TmPacketPusC.cpp
-    TmPacketBase.cpp
+          TmPacketStoredBase.cpp
-    TmPacketMinimal.cpp
+          TmPacketBase.cpp
-)
+          TmPacketMinimal.cpp)

src/fsfw/tmtcservices/CMakeLists.txt

@@ -1,10 +1,9 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(
-	PRIVATE 
+  ${LIB_FSFW_NAME}
-		CommandingServiceBase.cpp
+  PRIVATE CommandingServiceBase.cpp
-		PusServiceBase.cpp
+          PusServiceBase.cpp
-		PusVerificationReport.cpp
+          PusVerificationReport.cpp
-		TmTcBridge.cpp
+          TmTcBridge.cpp
-		TmTcMessage.cpp
+          TmTcMessage.cpp
-		VerificationReporter.cpp
+          VerificationReporter.cpp
-		SpacePacketParser.cpp
+          SpacePacketParser.cpp)
-)