diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2018-05-04 20:02:56 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2018-05-04 20:02:56 +0200 |
| commit | 291a96613e9a244e455229dbff4e2dbdc8cab9c9 (patch) | |
| tree | b6d99d8759b5e970e6d4cd307d6ffd81f2a93ddc | |
| parent | 2f467d57d1846857eb8ac7e855646c19d6b66737 (diff) | |
| download | PROJ-291a96613e9a244e455229dbff4e2dbdc8cab9c9.tar.gz PROJ-291a96613e9a244e455229dbff4e2dbdc8cab9c9.zip | |
cmake: fix build with msys where both pthread and win32 threads are detected (fixes #976)
| -rw-r--r-- | src/lib_proj.cmake | 8 |
1 files 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() ############################################## |