From a62ec7656172bc19721d5a51629e0f5312797ec1 Mon Sep 17 00:00:00 2001 From: Paul Osborne Date: Thu, 18 Jun 2020 15:47:14 +0000 Subject: [PATCH] cmake: avoid problems from use of CMAKE_USE_PTHREADS_INIT In some CMake integrations, portions of the toolchain may end up defining CMAKE_USE_PTHREADS_INIT even when EVENT__DISABLE_THREAD_SUPPORT is set for libevent. Modify the build to not rely on this side effect of find_package(Threads, ...) [which could be done elsewhere] but instead to use EVENT__HAVE_PTHREADS which is defined only on the desired codepath. Without this change, affected builds fail as a result of event_pthreads source files being built but with build defines which cause the build to fail. Signed-off-by: Paul Osborne (cherry picked from commit 26d5ff457c9e6cf9b84ec9d8fb83d87caf083d96) --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ae98c20..741c2f5f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -960,7 +960,7 @@ if (NOT EVENT__DISABLE_OPENSSL) SOURCES ${SRC_OPENSSL}) endif() -if (CMAKE_USE_PTHREADS_INIT) +if (EVENT__HAVE_PTHREADS) set(SRC_PTHREADS evthread_pthread.c) add_event_library(event_pthreads INNER_LIBRARIES event_core @@ -1130,7 +1130,7 @@ if (NOT EVENT__DISABLE_TESTS) if (NOT EVENT__DISABLE_THREAD_SUPPORT) list(APPEND SRC_REGRESS test/regress_thread.c) endif() - elseif (CMAKE_USE_PTHREADS_INIT) + elseif (EVENT__HAVE_PTHREADS) list(APPEND SRC_REGRESS test/regress_thread.c) endif()