cmake: Use find_package to find pthreads

diff --git a/src/libbacktrace_test/CMakeLists.txt b/src/libbacktrace_test/CMakeLists.txt
index a42f35d405a32eba42aaeee4f7f1146f92d6aad5..ffda4e9290a03ddd02fef8e8360523cc94a26207 100644 (file)
--- a/src/libbacktrace_test/CMakeLists.txt
+++ b/src/libbacktrace_test/CMakeLists.txt
@@ -2,6 +2,10 @@ project(libbacktrace_test)
 cmake_minimum_required(VERSION 2.8)
 
 include("${SRC_DIR}/build_options.cmake")
+find_package(Threads)
+if (NOT CMAKE_USE_PTHREADS_INIT)
+    message(ERROR "pthread not found")
+endif ()
 
 # remove -rdynamic from our shared library (for testing realistic backtraces).
 set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS )
@@ -21,7 +25,7 @@ set(SRC_LIST
 add_executable(${PROJECT_NAME} ${SRC_LIST})
 target_link_libraries(${PROJECT_NAME}
     backtrace
-    pthread
+    ${CMAKE_THREAD_LIBS_INIT}
     voglcore
     mainlib
     ${CMAKE_DL_LIBS}

diff --git a/src/voglcmd/CMakeLists.txt b/src/voglcmd/CMakeLists.txt
index 487cc7ffaff7370fac60979c26fa33a0a7a2ee62..c612b05efade1cc985e4f16c6759a2cb3247356b 100644 (file)
--- a/src/voglcmd/CMakeLists.txt
+++ b/src/voglcmd/CMakeLists.txt
@@ -3,6 +3,10 @@ include("${SRC_DIR}/build_options.cmake")
 project(vogl)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
+find_package(Threads)
+if (NOT CMAKE_USE_PTHREADS_INIT)
+    message(ERROR "pthread not found")
+endif ()
 
 set(MySources 
     voglcmd.cpp 
@@ -28,7 +32,7 @@ add_executable(
 )
 
 target_link_libraries(${PROJECT_NAME}
-    pthread
+    ${CMAKE_THREAD_LIBS_INIT}
     rt
     voglcore)
 

diff --git a/src/voglcore/CMakeLists.txt b/src/voglcore/CMakeLists.txt
index 9b6dda144666f4cbc24ed99681a2b4c14bf949d4..476cb3a241e2e3aa19d2ff5c6d44016685640742 100644 (file)
--- a/src/voglcore/CMakeLists.txt
+++ b/src/voglcore/CMakeLists.txt
@@ -2,6 +2,10 @@ project(voglcore)
 cmake_minimum_required(VERSION 2.8)
 
 option(VOGL_ENABLE_ASSERTS "Enable assertions in all builds (including release)" FALSE)
+find_package(Threads)
+if (NOT CMAKE_USE_PTHREADS_INIT)
+    message(ERROR "pthread not found")
+endif ()
 
 include("${SRC_DIR}/build_options.cmake")
 
@@ -106,7 +110,7 @@ endif()
 
 add_library(${PROJECT_NAME} ${SRC_LIST})
 target_link_libraries(${PROJECT_NAME}
-    pthread
+    ${CMAKE_THREAD_LIBS_INIT}
     rt
     )
 

diff --git a/src/voglreplay/CMakeLists.txt b/src/voglreplay/CMakeLists.txt
index 6a19603a67814515fa5c6d0456a02bd9be367a66..be7ed8948a642df0bfd88db0b3f117f05ca589d1 100644 (file)
--- a/src/voglreplay/CMakeLists.txt
+++ b/src/voglreplay/CMakeLists.txt
@@ -2,6 +2,10 @@ project(voglreplay)
 cmake_minimum_required(VERSION 2.8)
 
 include("${SRC_DIR}/build_options.cmake")
+find_package(Threads)
+if (NOT CMAKE_USE_PTHREADS_INIT)
+    message(ERROR "pthread not found")
+endif ()
 find_package(X11 REQUIRED)
 
 
@@ -35,7 +39,7 @@ target_link_libraries(${PROJECT_NAME}
     voglcommon
     ${CMAKE_DL_LIBS}
     ${X11_X11_LIB}
-    pthread
+    ${CMAKE_THREAD_LIBS_INIT}
     voglcore
     rt
     )

diff --git a/src/voglserver/CMakeLists.txt b/src/voglserver/CMakeLists.txt
index 84aebc27370143e22b99ec16cbaed7845f5f18e9..b977851ddc546d479a416c7adc455e1526c66336 100644 (file)
--- a/src/voglserver/CMakeLists.txt
+++ b/src/voglserver/CMakeLists.txt
@@ -3,6 +3,10 @@ include("${SRC_DIR}/build_options.cmake")
 project(voglserver)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
+find_package(Threads)
+if (NOT CMAKE_USE_PTHREADS_INIT)
+    message(ERROR "pthread not found")
+endif ()
 
 set(MySources 
     server.cpp 
@@ -26,7 +30,7 @@ add_executable(
 )
 
 target_link_libraries(${PROJECT_NAME}
-    pthread
+    ${CMAKE_THREAD_LIBS_INIT}
     rt
     voglcore)
 

diff --git a/src/vogltrace/CMakeLists.txt b/src/vogltrace/CMakeLists.txt
index d15fcc06f2f335cae528c39fc6a853e02062ab26..dbf66ce314e8950c04300d6a204c0e15e260ea5f 100644 (file)
--- a/src/vogltrace/CMakeLists.txt
+++ b/src/vogltrace/CMakeLists.txt
@@ -3,6 +3,10 @@ cmake_minimum_required(VERSION 2.8)
 option(VOGLTRACE_NO_PUBLIC_EXPORTS "Don't define any public GL exports in libvogltraceXX.so, this .so will only be useful for manual loading" FALSE)
 
 include("${SRC_DIR}/build_options.cmake")
+find_package(Threads)
+if (NOT CMAKE_USE_PTHREADS_INIT)
+    message(ERROR "pthread not found")
+endif ()
 find_package(X11 REQUIRED)
 
 project(vogltrace)
@@ -51,7 +55,7 @@ target_link_libraries(${PROJECT_NAME}
     backtrace
     voglcommon
     voglcore
-    pthread
+    ${CMAKE_THREAD_LIBS_INIT}
     ${CMAKE_DL_LIBS}
     ${X11_X11_LIB}
     libturbojpeg.a