CMakeLists.txt

@@ -13,10 +13,6 @@ option(FSFW_ADD_INTERNAL_TESTS "Add internal unit tests" ON)
 option(FSFW_ADD_UNITTESTS "Add regular unittests. Requires Catch2" OFF)
 option(FSFW_ADD_HAL "Add Hardware Abstraction Layer" ON)
 
-if(FSFW_ADD_UNITTESTS)
-    option(FSFW_CUSTOM_UNITTEST_RUNNER "Add FSFW custom main runner" ON)
-endif()
-
 # Optional sources
 option(FSFW_ADD_PUS "Compile with PUS sources" ON)
 option(FSFW_ADD_MONITORING "Compile with monitoring components" ON)

hal/src/fsfw_hal/linux/CMakeLists.txt

@@ -4,6 +4,7 @@ endif()
 
 target_sources(${LIB_FSFW_NAME} PRIVATE
 	UnixFileGuard.cpp
+	CommandExecutor.cpp
 	utility.cpp
 )
 

src/fsfw/osal/linux/CMakeLists.txt

@@ -1,5 +1,4 @@
-target_sources(${LIB_FSFW_NAME} 
+target_sources(${LIB_FSFW_NAME} PRIVATE
-	PRIVATE 
     Clock.cpp
     BinarySemaphore.cpp
     CountingSemaphore.cpp
@@ -15,7 +14,6 @@ target_sources(${LIB_FSFW_NAME}
     TaskFactory.cpp
     tcpipHelpers.cpp
     unixUtility.cpp
-		CommandExecutor.cpp
 )
 
 find_package(Threads REQUIRED)