summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2010-06-15 18:05:40 (GMT)
committerBrad King <brad.king@kitware.com>2010-06-15 18:05:40 (GMT)
commit520b760c80c3bed1e84de393a2e28dd73936bc32 (patch)
tree3d7b7e6f8425e2c0cf072ef806106e771c3df437 /Modules
parent5444bd6ca39425f092e3e6b0f19cd70869742091 (diff)
parentd09664a4d4fc34d14579bcd00d301c299e58a96d (diff)
downloadCMake-520b760c80c3bed1e84de393a2e28dd73936bc32.zip
CMake-520b760c80c3bed1e84de393a2e28dd73936bc32.tar.gz
CMake-520b760c80c3bed1e84de393a2e28dd73936bc32.tar.bz2
Merge branch 'findthreads-irix'
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindThreads.cmake6
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/FindThreads.cmake b/Modules/FindThreads.cmake
index 459129b..2a74304 100644
--- a/Modules/FindThreads.cmake
+++ b/Modules/FindThreads.cmake
@@ -5,6 +5,8 @@
# CMAKE_USE_WIN32_THREADS_INIT - using WIN32 threads?
# CMAKE_USE_PTHREADS_INIT - are we using pthreads
# CMAKE_HP_PTHREADS_INIT - are we using hp pthreads
+# For systems with multiple thread libraries, caller can set
+# CMAKE_THREAD_PREFER_PTHREADS
#=============================================================================
# Copyright 2002-2009 Kitware, Inc.
@@ -24,11 +26,11 @@ INCLUDE (CheckLibraryExists)
SET(Threads_FOUND FALSE)
# Do we have sproc?
-IF(CMAKE_SYSTEM MATCHES IRIX)
+IF(CMAKE_SYSTEM MATCHES IRIX AND NOT CMAKE_THREAD_PREFER_PTHREAD)
CHECK_INCLUDE_FILES("sys/types.h;sys/prctl.h" CMAKE_HAVE_SPROC_H)
ENDIF()
-IF(CMAKE_HAVE_SPROC_H)
+IF(CMAKE_HAVE_SPROC_H AND NOT CMAKE_THREAD_PREFER_PTHREAD)
# We have sproc
SET(CMAKE_USE_SPROC_INIT 1)
ELSE()