[cmake-commits] king committed FindThreads.cmake 1.17 1.18

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv19782

Modified Files:
	FindThreads.cmake 
Log Message:
BUG: Enable CMAKE_HP_PTHREADS only when the old CMA threads are available.  Modern HP pthreads are just normal pthreads.


Index: FindThreads.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindThreads.cmake,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- FindThreads.cmake	20 Sep 2007 21:21:23 -0000	1.17
+++ FindThreads.cmake	24 Sep 2007 13:53:41 -0000	1.18
@@ -95,12 +95,14 @@
     #   http://docs.hp.com/en/B3920-90091/ch12s03.html#d0e11395
     #   http://docs.hp.com/en/947/d8.html
     # but we need to maintain compatibility here.
+    # The CMAKE_HP_PTHREADS setting actually indicates whether CMA threads
+    # are available.
     CHECK_LIBRARY_EXISTS(cma pthread_attr_create "" CMAKE_HAVE_HP_CMA)
     IF(CMAKE_HAVE_HP_CMA)
       SET(CMAKE_THREAD_LIBS_INIT "-lcma")
+      SET(CMAKE_HP_PTHREADS_INIT 1)
     ENDIF(CMAKE_HAVE_HP_CMA)
     SET(CMAKE_USE_PTHREADS_INIT 1)
-    SET(CMAKE_HP_PTHREADS_INIT 1)
   ENDIF(CMAKE_SYSTEM MATCHES "HP-UX-*")
 
   IF(CMAKE_SYSTEM MATCHES "OSF1-V*")