Merge branch 'development' into mueller/devicehandler-bugfix

This commit is contained in:
Steffen Gaisser 2021-01-12 13:28:10 +01:00
commit 67879bf12f
5 changed files with 17 additions and 7 deletions

View File

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

View File

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

View File

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

View File

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

2
unittest/CMakeLists.txt Normal file
View File

@ -0,0 +1,2 @@
add_subdirectory(internal)
add_subdirectory(tests)