36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
From 91f157648704eea49f0cc0f1a6f54416ce5130db Mon Sep 17 00:00:00 2001
|
|
Date: Wed, 24 Jan 2018 18:50:56 +0300
|
|
Subject: [PATCH] Change check for pthread
|
|
|
|
---
|
|
cmake/Modules/FindThreads.cmake | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/cmake/Modules/FindThreads.cmake b/cmake/Modules/FindThreads.cmake
|
|
index d071ff5..782f4cf 100644
|
|
--- a/cmake/Modules/FindThreads.cmake
|
|
+++ b/cmake/Modules/FindThreads.cmake
|
|
@@ -86,12 +86,18 @@ else()
|
|
|
|
if(NOT Threads_FOUND AND NOT THREADS_HAVE_PTHREAD_ARG)
|
|
message(STATUS "Check if compiler accepts -pthread")
|
|
- try_run(THREADS_PTHREAD_ARG THREADS_HAVE_PTHREAD_ARG
|
|
+
|
|
+ if(CMAKE_CROSSCOMPILING STREQUAL "ON")
|
|
+ set(THREADS_HAVE_PTHREAD_ARG TRUE)
|
|
+ set(THREADS_PTHREAD_ARG 2)
|
|
+ else()
|
|
+ try_run(THREADS_PTHREAD_ARG THREADS_HAVE_PTHREAD_ARG
|
|
${CMAKE_BINARY_DIR}
|
|
${CMAKE_CURRENT_LIST_DIR}/CheckForPthreads.c
|
|
COMPILE_DEFINITIONS -pthread
|
|
CMAKE_FLAGS -DLINK_LIBRARIES:STRING=-pthread
|
|
COMPILE_OUTPUT_VARIABLE OUTPUT)
|
|
+ endif()
|
|
|
|
if(THREADS_HAVE_PTHREAD_ARG)
|
|
if(THREADS_PTHREAD_ARG STREQUAL "2")
|
|
--
|
|
2.16.4
|
|
|