From a9df005bb15b4fd9b8110d9bb90651e4406da251 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sun, 13 Oct 2019 18:36:43 +1100
Subject: [PATCH] openthreads and openscenegraph: move try run results to cmake
 wrapper

---
 src/cmake/modules/TryRunResults.cmake | 14 +++++++++++++-
 src/openscenegraph.mk                 |  4 +---
 src/openthreads.mk                    |  5 +----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/cmake/modules/TryRunResults.cmake b/src/cmake/modules/TryRunResults.cmake
index 9e94accb..c60bab11 100644
--- a/src/cmake/modules/TryRunResults.cmake
+++ b/src/cmake/modules/TryRunResults.cmake
@@ -154,7 +154,7 @@ set( C_CHAR_SIGNED
 set( C_CHAR_SIGNED__TRYRUN_OUTPUT
      ""
      CACHE STRING "Output from TRY_RUN" FORCE)
-set( HAVE_IOEO_EXITCODE 
+set( HAVE_IOEO_EXITCODE
      "0"
      CACHE STRING "Result from TRY_RUN" FORCE)
 set( CMAKE_REQUIRE_LARGE_FILE_SUPPORT
@@ -163,3 +163,15 @@ set( CMAKE_REQUIRE_LARGE_FILE_SUPPORT
 set( CMAKE_REQUIRE_LARGE_FILE_SUPPORT__TRYRUN_OUTPUT
      ""
      CACHE STRING "Output from TRY_RUN" FORCE)
+set( _OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE
+     "1"
+     CACHE STRING "Result from TRY_RUN" FORCE)
+set( _OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE__TRYRUN_OUTPUT
+     ""
+     CACHE STRING "Output from TRY_RUN" FORCE)
+set( POPPLER_HAS_CAIRO_EXITCODE
+     "0"
+     CACHE STRING "Result from TRY_RUN" FORCE)
+set( POPPLER_HAS_CAIRO_EXITCODE__TRYRUN_OUTPUT
+     ""
+     CACHE STRING "Output from TRY_RUN" FORCE)
diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk
index 9a70ad93..f05a90ae 100644
--- a/src/openscenegraph.mk
+++ b/src/openscenegraph.mk
@@ -27,9 +27,7 @@ define $(PKG)_BUILD
         -DDYNAMIC_OPENTHREADS=$(CMAKE_SHARED_BOOL) \
         -DDYNAMIC_OPENSCENEGRAPH=$(CMAKE_SHARED_BOOL) \
         -DBUILD_OSG_APPLICATIONS=OFF \
-        -DPOPPLER_HAS_CAIRO_EXITCODE=0 \
-        -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1 \
-        -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=1
+        -DOPENTHREADS_ATOMIC_USE_MUTEX=ON
 
     $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' VERBOSE=1
     $(MAKE) -C '$(BUILD_DIR)' -j 1 install VERBOSE=1
diff --git a/src/openthreads.mk b/src/openthreads.mk
index b1c1c644..ff28cbd7 100644
--- a/src/openthreads.mk
+++ b/src/openthreads.mk
@@ -20,10 +20,7 @@ define $(PKG)_BUILD
         -DDYNAMIC_OPENTHREADS=$(CMAKE_SHARED_BOOL) \
         -DOSG_DETERMINE_WIN_VERSION=OFF \
         -DCMAKE_VERBOSE_MAKEFILE=TRUE \
-        -DPOPPLER_HAS_CAIRO_EXITCODE=0 \
-        -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1 \
-        -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=1 \
-        '$(1)'
+        -DOPENTHREADS_ATOMIC_USE_MUTEX=ON
 
     $(MAKE) -C '$(BUILD_DIR)/src/OpenThreads' -j '$(JOBS)' VERBOSE=1
     $(MAKE) -C '$(BUILD_DIR)/src/OpenThreads' -j 1 install VERBOSE=1