[Cmake-commits] CMake branch, next, updated. v2.8.1-1391-g046b331

[Clinton Stimpson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  046b331acd71e0c9e7c99d0eb3d7b4387a98b175 (commit)
       via  d09664a4d4fc34d14579bcd00d301c299e58a96d (commit)
      from  b31da59e5287738c109640936a9f605fd3875148 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=046b331acd71e0c9e7c99d0eb3d7b4387a98b175
commit 046b331acd71e0c9e7c99d0eb3d7b4387a98b175
Merge: b31da59 d09664a
Author: Clinton Stimpson <clinton at elemtech.com>
Date:   Fri Jun 11 18:11:56 2010 -0600

    Merge branch 'findthreads-irix' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d09664a4d4fc34d14579bcd00d301c299e58a96d
commit d09664a4d4fc34d14579bcd00d301c299e58a96d
Author: Clinton Stimpson <clinton at elemtech.com>
Date:   Fri Jun 11 18:10:38 2010 -0600

    Support pthreads on irix.

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()

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindThreads.cmake |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake