[Cmake-commits] [cmake-commits] hoffman committed FindThreads.cmake 1.18 1.19

[cmake-commits at cmake.org]

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

Modified Files:
	FindThreads.cmake 
Log Message:
BUG: fix for 6586, set THREADS_FOUND


Index: FindThreads.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindThreads.cmake,v
retrieving revision 1.18
retrieving revision 1.19
diff -C 2 -d -r1.18 -r1.19
*** FindThreads.cmake	24 Sep 2007 13:53:41 -0000	1.18
--- FindThreads.cmake	11 Sep 2008 15:41:00 -0000	1.19
***************
*** 9,12 ****
--- 9,13 ----
  INCLUDE (CheckIncludeFiles)
  INCLUDE (CheckLibraryExists)
+ SET(Threads_FOUND FALSE)
  
  # Do we have sproc?
***************
*** 31,34 ****
--- 32,36 ----
          SET(CMAKE_THREAD_LIBS_INIT "-lpthreads")
          SET(CMAKE_HAVE_THREADS_LIBRARY 1)
+         SET(Threads_FOUND TRUE)
        ENDIF(CMAKE_HAVE_PTHREADS_CREATE)
        # Ok, how about -lpthread
***************
*** 36,39 ****
--- 38,42 ----
        IF(CMAKE_HAVE_PTHREAD_CREATE)
          SET(CMAKE_THREAD_LIBS_INIT "-lpthread")
+         SET(Threads_FOUND TRUE)
          SET(CMAKE_HAVE_THREADS_LIBRARY 1)
        ENDIF(CMAKE_HAVE_PTHREAD_CREATE)
***************
*** 44,47 ****
--- 47,51 ----
            SET(CMAKE_THREAD_LIBS_INIT "-lthread")
            SET(CMAKE_HAVE_THREADS_LIBRARY 1)
+           SET(Threads_FOUND TRUE)
          ENDIF(CMAKE_HAVE_THR_CREATE)
        ENDIF(CMAKE_SYSTEM MATCHES "SunOS.*")
***************
*** 59,62 ****
--- 63,67 ----
          IF(THREADS_HAVE_PTHREAD_ARG)
            IF(THREADS_PTHREAD_ARG MATCHES "^2$")
+             SET(Threads_FOUND TRUE)
              MESSAGE(STATUS "Check if compiler accepts -pthread - yes")
            ELSE(THREADS_PTHREAD_ARG MATCHES "^2$")
***************
*** 74,77 ****
--- 79,83 ----
        ENDIF("THREADS_HAVE_PTHREAD_ARG" MATCHES "^THREADS_HAVE_PTHREAD_ARG")
        IF(THREADS_HAVE_PTHREAD_ARG)
+         SET(Threads_FOUND TRUE)
          SET(CMAKE_THREAD_LIBS_INIT "-pthread")
        ENDIF(THREADS_HAVE_PTHREAD_ARG)
***************
*** 82,89 ****
--- 88,97 ----
  IF(CMAKE_THREAD_LIBS_INIT)
    SET(CMAKE_USE_PTHREADS_INIT 1)
+   SET(Threads_FOUND TRUE)
  ENDIF(CMAKE_THREAD_LIBS_INIT)
  
  IF(CMAKE_SYSTEM MATCHES "Windows")
    SET(CMAKE_USE_WIN32_THREADS_INIT 1)
+   SET(Threads_FOUND TRUE)
  ENDIF(CMAKE_SYSTEM MATCHES "Windows")
  
***************
*** 102,105 ****
--- 110,114 ----
        SET(CMAKE_THREAD_LIBS_INIT "-lcma")
        SET(CMAKE_HP_PTHREADS_INIT 1)
+       SET(Threads_FOUND TRUE)
      ENDIF(CMAKE_HAVE_HP_CMA)
      SET(CMAKE_USE_PTHREADS_INIT 1)
***************
*** 113,116 ****
--- 122,126 ----
    IF(CMAKE_SYSTEM MATCHES "CYGWIN_NT*")
      SET(CMAKE_USE_PTHREADS_INIT 1)
+     SET(Threads_FOUND TRUE)
      SET(CMAKE_THREAD_LIBS_INIT )
      SET(CMAKE_USE_WIN32_THREADS_INIT 0)
***************
*** 118,119 ****
--- 128,131 ----
  ENDIF(CMAKE_USE_PTHREADS_INIT)
  
+ INCLUDE(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Threads DEFAULT_MSG Threads_FOUND)