Merge branch 'mueller/cmd-executor' into mueller/master

2021-10-11 20:06:10 +02:00 · 2021-10-11 20:06:10 +02:00 · 0dedd8f2a1
commit 0dedd8f2a1
parent 4130dd9e32 d693817158
4 changed files with 17 additions and 18 deletions
--- 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
 )

--- a/hal/src/fsfw_hal/linux/CommandExecutor.cpp
+++ b/hal/src/fsfw_hal/linux/CommandExecutor.cpp
--- a/hal/src/fsfw_hal/linux/CommandExecutor.h
+++ b/hal/src/fsfw_hal/linux/CommandExecutor.h
--- a/src/fsfw/osal/linux/CMakeLists.txt
+++ b/src/fsfw/osal/linux/CMakeLists.txt
@ -1,5 +1,4 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
+target_sources(${LIB_FSFW_NAME} 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)