diff --git a/CMakeLists.txt b/CMakeLists.txt index a6529995b..4df39c0e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -303,12 +303,6 @@ else() CHECK_SYMBOL_EXISTS(strndup string.h HAVE_STRNDUP) endif() -if(NOT WIN32) - list(APPEND CMAKE_REQUIRED_LIBRARIES pthread) - check_symbol_exists(pthread_mutex_timedlock pthread.h HAVE_PTHREAD_MUTEX_TIMEDLOCK) - list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES pthread) -endif() - # Enable address sanitizer, where supported and when required if(${CMAKE_C_COMPILER_ID} STREQUAL "Clang" OR CMAKE_COMPILER_IS_GNUCC) CHECK_C_COMPILER_FLAG ("-fno-omit-frame-pointer" fno-omit-frame-pointer) diff --git a/config.h.in b/config.h.in index 65739cbac..902bd891e 100644 --- a/config.h.in +++ b/config.h.in @@ -12,7 +12,6 @@ #cmakedefine HAVE_POLL_H #cmakedefine HAVE_SYSLOG_H #cmakedefine HAVE_JOURNALD_H -#cmakedefine HAVE_PTHREAD_MUTEX_TIMEDLOCK #cmakedefine HAVE_VALGRIND_MEMCHECK_H #cmakedefine HAVE_EXECINFO_H #cmakedefine HAVE_GETLOGIN_R diff --git a/uwac/templates/config.h.in b/uwac/templates/config.h.in index d828a05a0..0d733317b 100644 --- a/uwac/templates/config.h.in +++ b/uwac/templates/config.h.in @@ -6,7 +6,6 @@ #cmakedefine HAVE_POLL_H #cmakedefine HAVE_SYSLOG_H #cmakedefine HAVE_JOURNALD_H -#cmakedefine HAVE_PTHREAD_MUTEX_TIMEDLOCK #cmakedefine HAVE_GETLOGIN_R #cmakedefine HAVE_STRNDUP #cmakedefine HAVE_PIXMAN_REGION diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt index 878617498..c50ad7999 100644 --- a/winpr/CMakeLists.txt +++ b/winpr/CMakeLists.txt @@ -151,6 +151,7 @@ endif() endif() if(NOT WIN32) + list(APPEND CMAKE_REQUIRED_LIBRARIES pthread) CHECK_SYMBOL_EXISTS(pthread_mutex_timedlock pthread.h HAVE_PTHREAD_MUTEX_TIMEDLOCK_SYMBOL) if (NOT HAVE_PTHREAD_MUTEX_TIMEDLOCK_SYMBOL) CHECK_LIBRARY_EXISTS(pthread pthread_mutex_timedlock "" HAVE_PTHREAD_MUTEX_TIMEDLOCK_LIB) @@ -162,6 +163,7 @@ endif() if (HAVE_PTHREAD_MUTEX_TIMEDLOCK_SYMBOL OR HAVE_PTHREAD_MUTEX_TIMEDLOCK_LIB OR HAVE_PTHREAD_MUTEX_TIMEDLOCK_LIBS) set(HAVE_PTHREAD_MUTEX_TIMEDLOCK ON) endif (HAVE_PTHREAD_MUTEX_TIMEDLOCK_SYMBOL OR HAVE_PTHREAD_MUTEX_TIMEDLOCK_LIB OR HAVE_PTHREAD_MUTEX_TIMEDLOCK_LIBS) + list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES pthread) endif() set(OPENSSL_FEATURE_TYPE "RECOMMENDED")