39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
|
From c9bfe786331647237b90f5f9e35b4d2cad7aaa69 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Roger Leigh <rleigh@apache.org>
|
||
|
|
Date: Fri, 12 Oct 2018 12:02:58 +0000
|
||
|
|
Subject: [PATCH] cmake: Allow thread checks to fail and fall back to nothreads
|
||
|
|
|
||
|
|
Closes: #2155
|
||
|
|
|
||
|
|
|
||
|
|
git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@1843653 13f79535-47bb-0310-9956-ffa450edef68
|
||
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||
|
|
[Retrieved from: https://github.com/apache/xerces-c/commit/c9bfe786331647237b90f5f9e35b4d2cad7aaa69]
|
||
|
|
---
|
||
|
|
cmake/XercesMutexMgrSelection.cmake | 10 +++++++---
|
||
|
|
1 file changed, 7 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/cmake/XercesMutexMgrSelection.cmake b/cmake/XercesMutexMgrSelection.cmake
|
||
|
|
index 2f1d71c50..ad698840d 100644
|
||
|
|
--- a/cmake/XercesMutexMgrSelection.cmake
|
||
|
|
+++ b/cmake/XercesMutexMgrSelection.cmake
|
||
|
|
@@ -19,11 +19,15 @@
|
||
|
|
|
||
|
|
# mutexmgr selection
|
||
|
|
|
||
|
|
-option(threads "Threading support" ON)
|
||
|
|
+set(xerces_thread_default ON)
|
||
|
|
+find_package(Threads)
|
||
|
|
+if(NOT TARGET Threads::Threads)
|
||
|
|
+ set(xerces_thread_default ON)
|
||
|
|
+endif()
|
||
|
|
|
||
|
|
-include(CheckCXXSourceCompiles)
|
||
|
|
+option(threads "Threading support" ${xerces_thread_default})
|
||
|
|
|
||
|
|
-find_package(Threads REQUIRED)
|
||
|
|
+include(CheckCXXSourceCompiles)
|
||
|
|
|
||
|
|
function(thread_test outvar)
|
||
|
|
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
|