From 4130dd9e32eb1d4a5b0e993408ae614952bdd005 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 11 Oct 2021 19:38:53 +0200
Subject: [PATCH 1/4] using cmakelists from upstream

---
 CMakeLists.txt | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6acd9770..5ff66a6d 100644
--- a/CMakeLists.txt
+++ b/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)
@@ -190,4 +186,4 @@ target_compile_options(${LIB_FSFW_NAME} PRIVATE
 
 target_link_libraries(${LIB_FSFW_NAME} PRIVATE
     ${FSFW_ADDITIONAL_LINK_LIBS}
-)
+)
\ No newline at end of file

From f3dbf68f7c03d0863d380173ff842b3ec44c6760 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 11 Oct 2021 20:03:29 +0200
Subject: [PATCH 2/4] moved command executor

---
 .../src/fsfw_hal}/linux/CommandExecutor.cpp   |  0
 .../src/fsfw_hal}/linux/CommandExecutor.h     |  0
 src/fsfw/osal/linux/CMakeLists.txt            | 34 +++++++++----------
 3 files changed, 16 insertions(+), 18 deletions(-)
 rename {src/fsfw/osal => hal/src/fsfw_hal}/linux/CommandExecutor.cpp (100%)
 rename {src/fsfw/osal => hal/src/fsfw_hal}/linux/CommandExecutor.h (100%)

diff --git a/src/fsfw/osal/linux/CommandExecutor.cpp b/hal/src/fsfw_hal/linux/CommandExecutor.cpp
similarity index 100%
rename from src/fsfw/osal/linux/CommandExecutor.cpp
rename to hal/src/fsfw_hal/linux/CommandExecutor.cpp
diff --git a/src/fsfw/osal/linux/CommandExecutor.h b/hal/src/fsfw_hal/linux/CommandExecutor.h
similarity index 100%
rename from src/fsfw/osal/linux/CommandExecutor.h
rename to hal/src/fsfw_hal/linux/CommandExecutor.h
diff --git a/src/fsfw/osal/linux/CMakeLists.txt b/src/fsfw/osal/linux/CMakeLists.txt
index 63206cb2..dcdade67 100644
--- a/src/fsfw/osal/linux/CMakeLists.txt
+++ b/src/fsfw/osal/linux/CMakeLists.txt
@@ -1,21 +1,19 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		Clock.cpp
-		BinarySemaphore.cpp
-		CountingSemaphore.cpp
-		FixedTimeslotTask.cpp
-		InternalErrorCodes.cpp
-		MessageQueue.cpp
-		Mutex.cpp
-		MutexFactory.cpp
-		PeriodicPosixTask.cpp
-		PosixThread.cpp
-		QueueFactory.cpp
-		SemaphoreFactory.cpp
-		TaskFactory.cpp
-		tcpipHelpers.cpp
-		unixUtility.cpp
-		CommandExecutor.cpp
+target_sources(${LIB_FSFW_NAME} PRIVATE
+    Clock.cpp
+	BinarySemaphore.cpp
+	CountingSemaphore.cpp
+	FixedTimeslotTask.cpp
+	InternalErrorCodes.cpp
+	MessageQueue.cpp
+	Mutex.cpp
+	MutexFactory.cpp
+	PeriodicPosixTask.cpp
+	PosixThread.cpp
+	QueueFactory.cpp
+	SemaphoreFactory.cpp
+	TaskFactory.cpp
+	tcpipHelpers.cpp
+	unixUtility.cpp
 )
 
 find_package(Threads REQUIRED)

From d693817158af209b34c49ea09c6863a7a2bc1fbe Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 11 Oct 2021 20:05:11 +0200
Subject: [PATCH 3/4] added cmakelists source addition

---
 hal/src/fsfw_hal/linux/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hal/src/fsfw_hal/linux/CMakeLists.txt b/hal/src/fsfw_hal/linux/CMakeLists.txt
index 5944b0e5..0ec77524 100644
--- a/hal/src/fsfw_hal/linux/CMakeLists.txt
+++ b/hal/src/fsfw_hal/linux/CMakeLists.txt
@@ -4,6 +4,7 @@ endif()
 
 target_sources(${LIB_FSFW_NAME} PRIVATE
 	UnixFileGuard.cpp
+	CommandExecutor.cpp
 	utility.cpp
 )
 

From eba2f87b36429fc814f9d4768c68fd2827f4c410 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 13 Oct 2021 15:49:58 +0200
Subject: [PATCH 4/4] formatting tweak

---
 src/fsfw/osal/linux/CMakeLists.txt | 34 +++++++++++++++---------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/fsfw/osal/linux/CMakeLists.txt b/src/fsfw/osal/linux/CMakeLists.txt
index dcdade67..679b2931 100644
--- a/src/fsfw/osal/linux/CMakeLists.txt
+++ b/src/fsfw/osal/linux/CMakeLists.txt
@@ -1,29 +1,29 @@
 target_sources(${LIB_FSFW_NAME} PRIVATE
     Clock.cpp
-	BinarySemaphore.cpp
-	CountingSemaphore.cpp
-	FixedTimeslotTask.cpp
-	InternalErrorCodes.cpp
-	MessageQueue.cpp
-	Mutex.cpp
-	MutexFactory.cpp
-	PeriodicPosixTask.cpp
-	PosixThread.cpp
-	QueueFactory.cpp
-	SemaphoreFactory.cpp
-	TaskFactory.cpp
-	tcpipHelpers.cpp
-	unixUtility.cpp
+    BinarySemaphore.cpp
+    CountingSemaphore.cpp
+    FixedTimeslotTask.cpp
+    InternalErrorCodes.cpp
+    MessageQueue.cpp
+    Mutex.cpp
+    MutexFactory.cpp
+    PeriodicPosixTask.cpp
+    PosixThread.cpp
+    QueueFactory.cpp
+    SemaphoreFactory.cpp
+    TaskFactory.cpp
+    tcpipHelpers.cpp
+    unixUtility.cpp
 )
 
 find_package(Threads REQUIRED)
 
 target_link_libraries(${LIB_FSFW_NAME} PRIVATE
-	${CMAKE_THREAD_LIBS_INIT}
-	rt
+    ${CMAKE_THREAD_LIBS_INIT}
+    rt
 )
 
 target_link_libraries(${LIB_FSFW_NAME} INTERFACE
-	${CMAKE_THREAD_LIBS_INIT}
+    ${CMAKE_THREAD_LIBS_INIT}
 )