From 7c2919f93d6b0144daa3fec237ac5234543faa9d Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Mon, 2 Oct 2017 18:40:58 +1030 Subject: [PATCH 23/24] mingw build fix - use win32 threads The cmake FindThreads detects both win32 and pthreads on mingw. It also attempts a TryRun test for pthreads which won't work with a cross compile. --- CMakeLists.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b425415..b69a304b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,9 +10,13 @@ include(MacroOptionalFindPackage) find_package(PkgConfig) include(MacroEnsureVersion) include(MacroBoolTo01) -set(CMAKE_THREAD_PREFER_PTHREAD TRUE) -set(THREADS_PREFER_PTHREAD_FLAG TRUE) -find_package(Threads) +if (WIN32) + message("-- Using win32 threads") +else() + set(CMAKE_THREAD_PREFER_PTHREAD TRUE) + set(THREADS_PREFER_PTHREAD_FLAG TRUE) + find_package(Threads) +endif() include(TestBigEndian) test_big_endian(WORDS_BIGENDIAN) include(CheckFileOffsetBits) -- 2.11.0