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

Merge branch 'development' into mueller/bugfix/defaultcfg

Browse Source
This commit is contained in:
Steffen Gaisser 2021-01-12 13:27:19 +01:00
commit ba9a604c93
4 changed files with 15 additions and 6 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}
) )

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()

12
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
target_link_libraries(${LIB_FSFW_NAME} PRIVATE
${CMAKE_THREAD_LIBS_INIT}
rt rt
pthread
) )
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)