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

Merge branch 'mueller/test-update' into mueller/bundled-update

This commit is contained in:
Robin Müller 2020-12-28 18:01:05 +01:00
parent c5212226b8 b2c98f0ae4
commit 5b9c0e013e
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -139,5 +139,4 @@ target_include_directories(${LIB_FSFW_NAME} PRIVATE
target_compile_options(${LIB_FSFW_NAME} PRIVATE target_compile_options(${LIB_FSFW_NAME} PRIVATE
${WARNING_FLAGS} ${WARNING_FLAGS}
${COMPILER_FLAGS} ${COMPILER_FLAGS}
${ABI_FLAGS}
) )

3
defaultcfg/fsfwconfig/OBSWConfig.h
View File

@ -3,11 +3,12 @@
#include "OBSWVersion.h" #include "OBSWVersion.h"
#ifdef __cplusplus
#include "objects/systemObjectList.h" #include "objects/systemObjectList.h"
#include "events/subsystemIdRanges.h" #include "events/subsystemIdRanges.h"
#include "returnvalues/classIds.h" #include "returnvalues/classIds.h"
#ifdef __cplusplus
namespace config { namespace config {
#endif #endif

4
osal/host/CMakeLists.txt
View File

@ -13,9 +13,11 @@ target_sources(${LIB_FSFW_NAME}
) )
if(UNIX) if(UNIX)
find_package(Threads REQUIRED)
target_link_libraries(${LIB_FSFW_NAME} target_link_libraries(${LIB_FSFW_NAME}
PRIVATE PRIVATE
rt rt
pthread ${CMAKE_THREAD_LIBS_INIT}
) )
endif() endif()

14
osal/linux/CMakeLists.txt
View File

@ -18,8 +18,14 @@ target_sources(${LIB_FSFW_NAME}
Timer.cpp Timer.cpp
) )
target_link_libraries(${LIB_FSFW_NAME} find_package(Threads REQUIRED)
PRIVATE
rt target_link_libraries(${LIB_FSFW_NAME} PRIVATE
pthread ${CMAKE_THREAD_LIBS_INIT}
rt
) )
target_link_libraries(${LIB_FSFW_NAME} INTERFACE
${CMAKE_THREAD_LIBS_INIT}
)