From cbca2399c624f84cfc84a6788c7fdf760f207522 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 26 Nov 2017 00:18:21 +0100 Subject: [PATCH] Improve CMake usage for Threads --- CMakeLists.txt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b2651b25..66fa25b8b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -409,12 +409,21 @@ endif(NOT ENABLE_GENERIC_ARCH) ################################################################################ -# Find a thread library +# Find the POSIX thread (pthread) libraries ################################################################################ -if(NOT OS_IS_MACOSX) +if(CMAKE_VERSION VERSION_LESS 3.1) find_package(Threads REQUIRED) link_libraries(${CMAKE_THREAD_LIBS_INIT}) -endif(NOT OS_IS_MACOSX) +else(CMAKE_VERSION VERSION_LESS 3.1) + set(CMAKE_THREAD_PREFER_PTHREAD TRUE) + if(CMAKE_CROSSCOMPILING) + set(THREADS_PREFER_PTHREAD_FLAG FALSE) + else(CMAKE_CROSSCOMPILING) + set(THREADS_PREFER_PTHREAD_FLAG TRUE) + endif(CMAKE_CROSSCOMPILING) + find_package(Threads REQUIRED) + link_libraries(Threads::Threads) +endif(CMAKE_VERSION VERSION_LESS 3.1)