diff options
| author | Brad King <brad.king@kitware.com> | 2023-01-19 18:21:28 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-01-19 18:21:36 (GMT) |
| commit | 5031934fb05181eb925b81f6747feaa8ffa27787 (patch) | |
| tree | a0b9164df4469a3efa333166cadf477d76a294f6 /Modules/FindThreads.cmake | |
| parent | e107fd0713c93f8b7d5be54552b51b1632b34f8c (diff) | |
| parent | f6ed2585e595305d4866e4128bf98e9236b6ecd2 (diff) | |
| download | CMake-5031934fb05181eb925b81f6747feaa8ffa27787.zip CMake-5031934fb05181eb925b81f6747feaa8ffa27787.tar.gz CMake-5031934fb05181eb925b81f6747feaa8ffa27787.tar.bz2 | |
Merge topic 'configure-log'
f6ed2585e5 Modules: Record system inspection steps in the configure log
0f688386ea Modules: Drop redundant check logging to CMakeOutput.log and CMakeError.log
ecc26f98eb UsewxWidgets: Remove leftover debugging code
874c2e1198 FindQt4: Drop outdated advice to look at CMakeError.log on failure
a80465bcad GHS: Drop debugging message from log
9199449687 CompileFeatures: Warn explicitly when feature detection binary is not found
24ccc8c3c9 CompilerId: Restore logging of failed identifications
95976514f6 Tests: Avoid using CMake{Output,Error}.log files
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8089
Diffstat (limited to 'Modules/FindThreads.cmake')
| -rw-r--r-- | Modules/FindThreads.cmake | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/Modules/FindThreads.cmake b/Modules/FindThreads.cmake index 7326ef9..701c143 100644 --- a/Modules/FindThreads.cmake +++ b/Modules/FindThreads.cmake @@ -136,10 +136,8 @@ macro(_threads_check_flag_pthread) try_compile(THREADS_HAVE_PTHREAD_ARG SOURCE_FROM_FILE "${_threads_src}" "${CMAKE_CURRENT_LIST_DIR}/CheckForPthreads.c" CMAKE_FLAGS -DLINK_LIBRARIES:STRING=-pthread - OUTPUT_VARIABLE _cmake_check_pthreads_output) + ) - string(APPEND _cmake_find_threads_output "${_cmake_check_pthreads_output}") - unset(_cmake_check_pthreads_output) unset(_threads_src) if(THREADS_HAVE_PTHREAD_ARG) @@ -239,10 +237,4 @@ if(THREADS_FOUND AND NOT TARGET Threads::Threads) if(CMAKE_THREAD_LIBS_INIT) set_property(TARGET Threads::Threads PROPERTY INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}") endif() -elseif(NOT THREADS_FOUND AND _cmake_find_threads_output) - file(APPEND - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log - "Determining if compiler accepts -pthread failed with the following output:\n${_cmake_find_threads_output}\n\n") endif() - -unset(_cmake_find_threads_output) |