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

Updating development with upstream changes #2

Closed
muellerr wants to merge 38 commits from mueller/master into development
pull from: mueller/master
merge into: eive:development
Conversation 0 Commits 38 Files Changed 79 +5 -5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9eec75df26 - Show all commits

2
osal/host/CMakeLists.txt
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()

6
osal/linux/CMakeLists.txt
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
) )