BUG: fix for thread and cache override
This commit is contained in:
parent
5b17658c91
commit
d05716c498
|
@ -27,19 +27,19 @@ TEST_BIG_ENDIAN(CMAKE_WORDS_BIGENDIAN)
|
|||
INCLUDE (${CMAKE_ROOT}/Modules/FindX11.cmake)
|
||||
INCLUDE (${CMAKE_ROOT}/Modules/FindThreads.cmake)
|
||||
|
||||
SET (CMAKE_THREAD_LIBS "${CMAKE_THREAD_LIBS}" CACHE STRING
|
||||
SET (CMAKE_THREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}" CACHE STRING
|
||||
"Thread library used.")
|
||||
|
||||
SET (CMAKE_USE_PTHREADS "${CMAKE_USE_PTHREADS}" CACHE BOOL
|
||||
SET (CMAKE_USE_PTHREADS "${CMAKE_USE_PTHREADS_INIT}" CACHE BOOL
|
||||
"Use the pthreads library.")
|
||||
|
||||
SET (CMAKE_USE_WIN32_THREADS "${CMAKE_USE_WIN32_THREADS}" CACHE BOOL
|
||||
SET (CMAKE_USE_WIN32_THREADS "${CMAKE_USE_WIN32_THREADS_INIT}" CACHE BOOL
|
||||
"Use the win32 thread library.")
|
||||
|
||||
SET (CMAKE_HP_PTHREADS ${CMAKE_HP_PTHREADS} CACHE BOOL
|
||||
SET (CMAKE_HP_PTHREADS ${CMAKE_HP_PTHREADS_INIT} CACHE BOOL
|
||||
"Use HP pthreads.")
|
||||
|
||||
SET (CMAKE_USE_SPROC ${CMAKE_USE_SPROC} CACHE BOOL
|
||||
SET (CMAKE_USE_SPROC ${CMAKE_USE_SPROC_INIT} CACHE BOOL
|
||||
"Use sproc libs.")
|
||||
|
||||
MARK_AS_ADVANCED(
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
# This module determines the thread library of the system.
|
||||
# The following variables are set
|
||||
# CMAKE_THREAD_LIBS - the thread library to link into an application (-lpthread )
|
||||
# CMAKE_USE_SPROC - are we using sproc?
|
||||
# CMAKE_USE_WIN32_THREADS - are we using WIN32 threads
|
||||
# CMAKE_USE_PTHREADS - are we using pthreads
|
||||
#
|
||||
# CMAKE_THREAD_LIBS_INIT - the thread library to link into an application (-lpthread )
|
||||
# CMAKE_USE_SPROC_INIT - are we using sproc?
|
||||
# CMAKE_USE_WIN32_THREADS_INIT - are we using WIN32 threads
|
||||
# CMAKE_USE_PTHREADS_INIT - are we using pthreads
|
||||
# CMAKE_HP_PTHREADS_INIT - are we using hp pthreads
|
||||
|
||||
INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
|
||||
INCLUDE (${CMAKE_ROOT}/Modules/CheckLibraryExists.cmake)
|
||||
|
@ -18,53 +18,53 @@ IF(CMAKE_HAVE_PTHREAD_H)
|
|||
IF(NOT CMAKE_HAVE_SPROC_H)
|
||||
CHECK_LIBRARY_EXISTS(pthreads pthread_create "" CMAKE_HAVE_PTHREADS_CREATE)
|
||||
IF(CMAKE_HAVE_PTHREADS_CREATE)
|
||||
SET(CMAKE_THREAD_LIBS "-lpthreads")
|
||||
SET(CMAKE_THREAD_LIBS_INIT "-lpthreads")
|
||||
ENDIF(CMAKE_HAVE_PTHREADS_CREATE)
|
||||
CHECK_LIBRARY_EXISTS(pthread pthread_create "" CMAKE_HAVE_PTHREAD_CREATE)
|
||||
IF(CMAKE_HAVE_PTHREAD_CREATE)
|
||||
SET(CMAKE_THREAD_LIBS "-lpthread")
|
||||
SET(CMAKE_THREAD_LIBS_INIT "-lpthread")
|
||||
ENDIF(CMAKE_HAVE_PTHREAD_CREATE)
|
||||
IF(CMAKE_SYSTEM MATCHES "SunOS.*")
|
||||
CHECK_LIBRARY_EXISTS(thread thr_create "" CMAKE_HAVE_THR_CREATE)
|
||||
IF(CMAKE_HAVE_THR_CREATE)
|
||||
SET(CMAKE_THREAD_LIBS "-lthread")
|
||||
SET(CMAKE_THREAD_LIBS_INIT "-lthread")
|
||||
ENDIF(CMAKE_HAVE_THR_CREATE)
|
||||
ENDIF(CMAKE_SYSTEM MATCHES "SunOS.*")
|
||||
ENDIF(NOT CMAKE_HAVE_SPROC_H)
|
||||
ENDIF(CMAKE_HAVE_PTHREAD_H)
|
||||
|
||||
IF(CMAKE_HAVE_SPROC_H)
|
||||
SET(CMAKE_USE_SPROC 1)
|
||||
SET(CMAKE_USE_SPROC_INIT 1)
|
||||
ENDIF(CMAKE_HAVE_SPROC_H)
|
||||
IF(CMAKE_THREAD_LIBS)
|
||||
SET(CMAKE_USE_PTHREADS 1)
|
||||
ENDIF(CMAKE_THREAD_LIBS)
|
||||
IF(CMAKE_THREAD_LIBS_INIT)
|
||||
SET(CMAKE_USE_PTHREADS_INIT 1)
|
||||
ENDIF(CMAKE_THREAD_LIBS_INIT)
|
||||
|
||||
IF(CMAKE_SYSTEM MATCHES "Windows")
|
||||
SET(CMAKE_USE_WIN32_THREADS 1)
|
||||
SET(CMAKE_USE_WIN32_THREADS_INIT 1)
|
||||
ENDIF(CMAKE_SYSTEM MATCHES "Windows")
|
||||
|
||||
IF(CMAKE_USE_PTHREADS)
|
||||
IF(CMAKE_USE_PTHREADS_INIT)
|
||||
IF(CMAKE_SYSTEM MATCHES "HP-UX-*")
|
||||
SET(CMAKE_THREAD_LIBS "-lcma")
|
||||
SET(CMAKE_USE_PTHREADS 1)
|
||||
SET(CMAKE_HP_PTHREADS 1)
|
||||
SET(CMAKE_THREAD_LIBS_INIT "-lcma")
|
||||
SET(CMAKE_USE_PTHREADS_INIT 1)
|
||||
SET(CMAKE_HP_PTHREADS_INIT 1)
|
||||
ENDIF(CMAKE_SYSTEM MATCHES "HP-UX-*")
|
||||
|
||||
IF(CMAKE_SYSTEM MATCHES "OSF1-V*")
|
||||
SET(CMAKE_USE_PTHREADS 0)
|
||||
SET(CMAKE_THREAD_LIBS )
|
||||
SET(CMAKE_USE_PTHREADS_INIT 0)
|
||||
SET(CMAKE_THREAD_LIBS_INIT )
|
||||
ENDIF(CMAKE_SYSTEM MATCHES "OSF1-V*")
|
||||
|
||||
IF(CMAKE_SYSTEM MATCHES "FreeBSD*")
|
||||
SET(CMAKE_USE_PTHREADS 0)
|
||||
SET(CMAKE_THREAD_LIBS )
|
||||
SET(CMAKE_USE_PTHREADS_INIT 0)
|
||||
SET(CMAKE_THREAD_LIBS_INIT )
|
||||
ENDIF(CMAKE_SYSTEM MATCHES "FreeBSD*")
|
||||
|
||||
IF(CMAKE_SYSTEM MATCHES "CYGWIN_NT*")
|
||||
SET(CMAKE_USE_PTHREADS 1)
|
||||
SET(CMAKE_THREAD_LIBS )
|
||||
SET(CMAKE_USE_WIN32_THREADS 0)
|
||||
SET(CMAKE_USE_PTHREADS_INIT 1)
|
||||
SET(CMAKE_THREAD_LIBS_INIT )
|
||||
SET(CMAKE_USE_WIN32_THREADS_INIT 0)
|
||||
ENDIF(CMAKE_SYSTEM MATCHES "CYGWIN_NT*")
|
||||
ENDIF(CMAKE_USE_PTHREADS)
|
||||
ENDIF(CMAKE_USE_PTHREADS_INIT)
|
||||
|
||||
|
|
Loading…
Reference in New Issue