Merge branch 'development' into mueller/bugfix/defaultcfg
This commit is contained in:
commit
ba9a604c93
@ -139,5 +139,4 @@ target_include_directories(${LIB_FSFW_NAME} PRIVATE
|
||||
target_compile_options(${LIB_FSFW_NAME} PRIVATE
|
||||
${WARNING_FLAGS}
|
||||
${COMPILER_FLAGS}
|
||||
${ABI_FLAGS}
|
||||
)
|
||||
|
@ -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()
|
@ -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
2
unittest/CMakeLists.txt
Normal file
@ -0,0 +1,2 @@
|
||||
add_subdirectory(internal)
|
||||
add_subdirectory(tests)
|
Loading…
Reference in New Issue
Block a user