diff options
| author | Even Rouault <even.rouault@mines-paris.org> | 2018-05-05 16:28:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-05 16:28:21 +0200 |
| commit | 9c2b786299cd05b61f40a12d0d8f03324c43fc03 (patch) | |
| tree | 512e205e8e7491c9200ed3a719487d9eb8b5a0dd /src | |
| parent | 6605ac6709dda2bd1df7f3c2d589d5b16ed42df7 (diff) | |
| parent | 291a96613e9a244e455229dbff4e2dbdc8cab9c9 (diff) | |
| download | PROJ-9c2b786299cd05b61f40a12d0d8f03324c43fc03.tar.gz PROJ-9c2b786299cd05b61f40a12d0d8f03324c43fc03.zip | |
Merge pull request #978 from rouault/cmake_fix_msys
cmake: fix build with msys where both pthread and win32 threads are detected (fixes #976)
Diffstat (limited to 'src')
| -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() ############################################## |