diff options
| author | Brad King <brad.king@kitware.com> | 2022-02-28 18:09:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-02-28 18:09:00 (GMT) |
| commit | 02b04f1ca8d13410feeebb51756619b8f9d80a22 (patch) | |
| tree | aeba1968af781263c2a6ce38d5592922376c43b4 /Modules | |
| parent | be20a94fac9b4d02effbd050fb0bb86da7f1a74f (diff) | |
| parent | c6da90bd39f3e03ba6a2a4cfac0d179e04e0b236 (diff) | |
| download | CMake-02b04f1ca8d13410feeebb51756619b8f9d80a22.zip CMake-02b04f1ca8d13410feeebb51756619b8f9d80a22.tar.gz CMake-02b04f1ca8d13410feeebb51756619b8f9d80a22.tar.bz2 | |
Merge branch 'FindThreads-revert-libc-pthread-flag' into release-3.21
Merge-request: !7025
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindThreads.cmake | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/Modules/FindThreads.cmake b/Modules/FindThreads.cmake index ffd3352..c6a3451 100644 --- a/Modules/FindThreads.cmake +++ b/Modules/FindThreads.cmake @@ -164,21 +164,18 @@ if(CMAKE_HAVE_PTHREAD_H) elseif(CMAKE_CXX_COMPILER_LOADED) CHECK_CXX_SOURCE_COMPILES("${PTHREAD_C_CXX_TEST_SOURCE}" CMAKE_HAVE_LIBC_PTHREAD) endif() - - # Check for -pthread first if enabled. This is the recommended - # way, but not backwards compatible as one must also pass -pthread - # as compiler flag then. - if(THREADS_PREFER_PTHREAD_FLAG) - _check_pthreads_flag() - endif() - - if(Threads_FOUND) - # do nothing, we are done - elseif(CMAKE_HAVE_LIBC_PTHREAD) + if(CMAKE_HAVE_LIBC_PTHREAD) set(CMAKE_THREAD_LIBS_INIT "") set(CMAKE_HAVE_THREADS_LIBRARY 1) set(Threads_FOUND TRUE) else() + # Check for -pthread first if enabled. This is the recommended + # way, but not backwards compatible as one must also pass -pthread + # as compiler flag then. + if (THREADS_PREFER_PTHREAD_FLAG) + _check_pthreads_flag() + endif () + if(CMAKE_SYSTEM MATCHES "GHS-MULTI") _check_threads_lib(posix pthread_create CMAKE_HAVE_PTHREADS_CREATE) endif() |