Merge branch 'development' into mueller/rtems-update-stm32

2021-01-12 15:01:33 +01:00
parent 63e80206bc f81d3e81dc
commit fa66fafd2c
6 changed files with 21 additions and 9 deletions
--- a/osal/host/CMakeLists.txt
+++ b/osal/host/CMakeLists.txt
@ -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()
--- a/osal/linux/CMakeLists.txt
+++ b/osal/linux/CMakeLists.txt
@ -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}
+)
+