eive/fsfw
eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

Merge pull request 'Update FSFW' (#24) from mueller/master into eive/develop

Browse Source 
Reviewed-on: #24
This commit is contained in:
Jakob Meier 2021-10-13 17:09:56 +02:00
commit 6e507681eb
5 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -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_UNITTESTS "Add regular unittests. Requires Catch2" OFF)
option(FSFW_ADD_HAL "Add Hardware Abstraction Layer" ON) 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 # Optional sources
option(FSFW_ADD_PUS "Compile with PUS sources" ON) option(FSFW_ADD_PUS "Compile with PUS sources" ON)
option(FSFW_ADD_MONITORING "Compile with monitoring components" ON) option(FSFW_ADD_MONITORING "Compile with monitoring components" ON)

1
hal/src/fsfw_hal/linux/CMakeLists.txt
View File

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

0
src/fsfw/osal/linux/CommandExecutor.cpp → hal/src/fsfw_hal/linux/CommandExecutor.cpp
View File

0
src/fsfw/osal/linux/CommandExecutor.h → hal/src/fsfw_hal/linux/CommandExecutor.h
View File

4
src/fsfw/osal/linux/CMakeLists.txt
View File

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