From 291a96613e9a244e455229dbff4e2dbdc8cab9c9 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Fri, 4 May 2018 20:02:56 +0200 Subject: cmake: fix build with msys where both pthread and win32 threads are detected (fixes #976) --- src/lib_proj.cmake | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake index 82a8fc81..0a05b18d 100644 --- a/src/lib_proj.cmake +++ b/src/lib_proj.cmake @@ -26,13 +26,11 @@ endif(NOT USE_THREAD) find_package(Threads QUIET) if(USE_THREAD AND Threads_FOUND AND CMAKE_USE_WIN32_THREADS_INIT ) add_definitions( -DMUTEX_win32) -endif(USE_THREAD AND Threads_FOUND AND CMAKE_USE_WIN32_THREADS_INIT ) -if(USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT ) +elseif(USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT ) add_definitions( -DMUTEX_pthread) -endif(USE_THREAD AND Threads_FOUND AND CMAKE_USE_PTHREADS_INIT ) -if(USE_THREAD AND NOT Threads_FOUND) +elseif(USE_THREAD AND NOT Threads_FOUND) message(FATAL_ERROR "No thread library found and thread/mutex support is required by USE_THREAD option") -endif(USE_THREAD AND NOT Threads_FOUND) +endif() ############################################## -- cgit v1.2.3