kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "FindThreads: Try pthreads with no special option first (#11333)" 

This reverts commit fd61be7140.
This commit is contained in:
David Cole 2011-09-20 18:40:22 -04:00
parent 47dac7ec97
commit 98c49a4a25
1 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Modules/FindThreads.cmake
View File

@ -23,7 +23,6 @@
INCLUDE (CheckIncludeFiles) INCLUDE (CheckIncludeFiles)
INCLUDE (CheckLibraryExists) INCLUDE (CheckLibraryExists)
INCLUDE (CheckSymbolExists)
SET(Threads_FOUND FALSE) SET(Threads_FOUND FALSE)
# Do we have sproc? # Do we have sproc?
@ -45,15 +44,7 @@ ELSE()
# #
SET(CMAKE_HAVE_THREADS_LIBRARY) SET(CMAKE_HAVE_THREADS_LIBRARY)
IF(NOT THREADS_HAVE_PTHREAD_ARG) IF(NOT THREADS_HAVE_PTHREAD_ARG)
# Check if pthread functions are in normal C library
CHECK_SYMBOL_EXISTS(pthread_create pthread.h CMAKE_HAVE_LIBC_CREATE)
IF(CMAKE_HAVE_LIBC_CREATE)
SET(CMAKE_THREAD_LIBS_INIT "")
SET(CMAKE_HAVE_THREADS_LIBRARY 1)
SET(Threads_FOUND TRUE)
ENDIF()
IF(NOT CMAKE_HAVE_THREADS_LIBRARY)
# Do we have -lpthreads # Do we have -lpthreads
CHECK_LIBRARY_EXISTS(pthreads pthread_create "" CMAKE_HAVE_PTHREADS_CREATE) CHECK_LIBRARY_EXISTS(pthreads pthread_create "" CMAKE_HAVE_PTHREADS_CREATE)
IF(CMAKE_HAVE_PTHREADS_CREATE) IF(CMAKE_HAVE_PTHREADS_CREATE)
@ -66,8 +57,8 @@ ELSE()
CHECK_LIBRARY_EXISTS(pthread pthread_create "" CMAKE_HAVE_PTHREAD_CREATE) CHECK_LIBRARY_EXISTS(pthread pthread_create "" CMAKE_HAVE_PTHREAD_CREATE)
IF(CMAKE_HAVE_PTHREAD_CREATE) IF(CMAKE_HAVE_PTHREAD_CREATE)
SET(CMAKE_THREAD_LIBS_INIT "-lpthread") SET(CMAKE_THREAD_LIBS_INIT "-lpthread")
SET(CMAKE_HAVE_THREADS_LIBRARY 1)
SET(Threads_FOUND TRUE) SET(Threads_FOUND TRUE)
SET(CMAKE_HAVE_THREADS_LIBRARY 1)
ENDIF() ENDIF()
IF(CMAKE_SYSTEM MATCHES "SunOS.*") IF(CMAKE_SYSTEM MATCHES "SunOS.*")
@ -79,7 +70,7 @@ ELSE()
SET(Threads_FOUND TRUE) SET(Threads_FOUND TRUE)
ENDIF() ENDIF()
ENDIF(CMAKE_SYSTEM MATCHES "SunOS.*") ENDIF(CMAKE_SYSTEM MATCHES "SunOS.*")
ENDIF(NOT CMAKE_HAVE_THREADS_LIBRARY)
ENDIF(NOT THREADS_HAVE_PTHREAD_ARG) ENDIF(NOT THREADS_HAVE_PTHREAD_ARG)
IF(NOT CMAKE_HAVE_THREADS_LIBRARY) IF(NOT CMAKE_HAVE_THREADS_LIBRARY)
@ -120,7 +111,7 @@ ELSE()
ENDIF(CMAKE_HAVE_PTHREAD_H) ENDIF(CMAKE_HAVE_PTHREAD_H)
ENDIF() ENDIF()
IF(CMAKE_THREAD_LIBS_INIT OR CMAKE_HAVE_LIBC_CREATE) IF(CMAKE_THREAD_LIBS_INIT)
SET(CMAKE_USE_PTHREADS_INIT 1) SET(CMAKE_USE_PTHREADS_INIT 1)
SET(Threads_FOUND TRUE) SET(Threads_FOUND TRUE)
ENDIF() ENDIF()