88 lines
3.5 KiB
Plaintext
88 lines
3.5 KiB
Plaintext
$OpenBSD: patch-Modules_FindThreads_cmake,v 1.4 2012/05/07 07:06:20 dcoppa Exp $
|
|
--- Modules/FindThreads.cmake.orig Mon Apr 30 11:43:02 2012
|
|
+++ Modules/FindThreads.cmake Mon Apr 30 11:48:51 2012
|
|
@@ -43,80 +43,9 @@ ELSE()
|
|
# We have pthread.h
|
|
# Let's check for the library now.
|
|
#
|
|
- SET(CMAKE_HAVE_THREADS_LIBRARY)
|
|
- 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
|
|
- CHECK_LIBRARY_EXISTS(pthreads pthread_create "" CMAKE_HAVE_PTHREADS_CREATE)
|
|
- IF(CMAKE_HAVE_PTHREADS_CREATE)
|
|
- SET(CMAKE_THREAD_LIBS_INIT "-lpthreads")
|
|
- SET(CMAKE_HAVE_THREADS_LIBRARY 1)
|
|
- SET(Threads_FOUND TRUE)
|
|
- ENDIF()
|
|
-
|
|
- # Ok, how about -lpthread
|
|
- CHECK_LIBRARY_EXISTS(pthread pthread_create "" CMAKE_HAVE_PTHREAD_CREATE)
|
|
- IF(CMAKE_HAVE_PTHREAD_CREATE)
|
|
- SET(CMAKE_THREAD_LIBS_INIT "-lpthread")
|
|
- SET(CMAKE_HAVE_THREADS_LIBRARY 1)
|
|
- SET(Threads_FOUND TRUE)
|
|
- ENDIF()
|
|
-
|
|
- IF(CMAKE_SYSTEM MATCHES "SunOS.*")
|
|
- # On sun also check for -lthread
|
|
- CHECK_LIBRARY_EXISTS(thread thr_create "" CMAKE_HAVE_THR_CREATE)
|
|
- IF(CMAKE_HAVE_THR_CREATE)
|
|
- SET(CMAKE_THREAD_LIBS_INIT "-lthread")
|
|
- SET(CMAKE_HAVE_THREADS_LIBRARY 1)
|
|
- SET(Threads_FOUND TRUE)
|
|
- ENDIF()
|
|
- ENDIF(CMAKE_SYSTEM MATCHES "SunOS.*")
|
|
- ENDIF(NOT CMAKE_HAVE_THREADS_LIBRARY)
|
|
- ENDIF(NOT THREADS_HAVE_PTHREAD_ARG)
|
|
-
|
|
- IF(NOT CMAKE_HAVE_THREADS_LIBRARY)
|
|
- # If we did not found -lpthread, -lpthread, or -lthread, look for -pthread
|
|
- IF("THREADS_HAVE_PTHREAD_ARG" MATCHES "^THREADS_HAVE_PTHREAD_ARG")
|
|
- MESSAGE(STATUS "Check if compiler accepts -pthread")
|
|
- TRY_RUN(THREADS_PTHREAD_ARG THREADS_HAVE_PTHREAD_ARG
|
|
- ${CMAKE_BINARY_DIR}
|
|
- ${CMAKE_ROOT}/Modules/CheckForPthreads.c
|
|
- CMAKE_FLAGS -DLINK_LIBRARIES:STRING=-pthread
|
|
- COMPILE_OUTPUT_VARIABLE OUTPUT)
|
|
-
|
|
- IF(THREADS_HAVE_PTHREAD_ARG)
|
|
- IF(THREADS_PTHREAD_ARG MATCHES "^2$")
|
|
- SET(Threads_FOUND TRUE)
|
|
- MESSAGE(STATUS "Check if compiler accepts -pthread - yes")
|
|
- ELSE()
|
|
- MESSAGE(STATUS "Check if compiler accepts -pthread - no")
|
|
- FILE(APPEND
|
|
- ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
|
|
- "Determining if compiler accepts -pthread returned ${THREADS_PTHREAD_ARG} instead of 2. The compiler had the following output:\n${OUTPUT}\n\n")
|
|
- ENDIF()
|
|
- ELSE()
|
|
- MESSAGE(STATUS "Check if compiler accepts -pthread - no")
|
|
- FILE(APPEND
|
|
- ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
|
|
- "Determining if compiler accepts -pthread failed with the following output:\n${OUTPUT}\n\n")
|
|
- ENDIF()
|
|
-
|
|
- 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()
|
|
-
|
|
- ENDIF(NOT CMAKE_HAVE_THREADS_LIBRARY)
|
|
+ SET(CMAKE_HAVE_PTHREAD_CREATE 1)
|
|
+ SET(CMAKE_HAVE_THREADS_LIBRARY 1)
|
|
+ SET(CMAKE_THREAD_LIBS_INIT "-pthread")
|
|
ENDIF(CMAKE_HAVE_PTHREAD_H)
|
|
ENDIF()
|
|
|