From c5b197842fe784c47d281584d4fc0b6c2973aff6 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 24 Sep 2007 09:53:41 -0400 Subject: BUG: Enable CMAKE_HP_PTHREADS only when the old CMA threads are available. Modern HP pthreads are just normal pthreads. --- Modules/FindThreads.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Modules/FindThreads.cmake b/Modules/FindThreads.cmake index f7c19b8..98031e2 100644 --- a/Modules/FindThreads.cmake +++ b/Modules/FindThreads.cmake @@ -95,12 +95,14 @@ IF(CMAKE_USE_PTHREADS_INIT) # 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*") -- cgit v0.12