From 52a8c87f37f4bd133f670722d2d4b73a74e352bc Mon Sep 17 00:00:00 2001 From: Lasse Collin Date: Tue, 25 Jun 2024 15:51:48 +0300 Subject: [PATCH] CMake: Always add pthread flags into CMAKE_REQUIRED_LIBRARIES It was weird to add CMAKE_THREAD_LIBS_INIT in CMAKE_REQUIRED_LIBRARIES only if CLOCK_MONOTONIC is available. Alternative would be to remove the thread libs from CMAKE_REQUIRED_LIBRARIES after the check for pthread_condattr_setclock() but keeping the libs should be fine too. Then it's ready in case more pthread functions were wanted some day. (cherry picked from commit e620f35097c0ad20cd76d8258750aa706758ced9) --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 95589b8d..f7ebb024 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -638,11 +638,13 @@ if(ENABLE_THREADS) target_link_libraries(liblzma PRIVATE Threads::Threads) add_compile_definitions(MYTHREAD_POSIX) + # Make the thread libs available in later checks. In practice + # only pthread_condattr_setclock check should need this. + list(INSERT CMAKE_REQUIRED_LIBRARIES 0 "${CMAKE_THREAD_LIBS_INIT}") + # Check if pthread_condattr_setclock() exists to # use CLOCK_MONOTONIC. if(HAVE_CLOCK_MONOTONIC) - list(INSERT CMAKE_REQUIRED_LIBRARIES 0 - "${CMAKE_THREAD_LIBS_INIT}") check_symbol_exists(pthread_condattr_setclock pthread.h HAVE_PTHREAD_CONDATTR_SETCLOCK) tuklib_add_definition_if(ALL HAVE_PTHREAD_CONDATTR_SETCLOCK)