Updating development with upstream changes #2

Closed
muellerr wants to merge 38 commits from mueller/master into development
2 changed files with 5 additions and 5 deletions
Showing only changes of commit 9eec75df26 - Show all commits

View File

@ -16,6 +16,6 @@ if(UNIX)
target_link_libraries(${LIB_FSFW_NAME} target_link_libraries(${LIB_FSFW_NAME}
PRIVATE PRIVATE
rt rt
pthread ${CMAKE_THREAD_LIBS_INIT}
) )
endif() endif()

View File

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