From 2b20e61b0a0e2863a48ce88529fa809485ae68b2 Mon Sep 17 00:00:00 2001
From: Sean Lilley <lilleyse@gmail.com>
Date: Thu, 12 Sep 2024 21:56:52 -0400
Subject: [PATCH] fixes

---
 CMakeLists.txt        | 6 ++++++
 cmake/Macros.cmake    | 1 -
 extern/CMakeLists.txt | 1 +
 extern/cesium-native  | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23826e683..9e7a2ee19 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -439,6 +439,12 @@ if (NOT VCPKG_TRIPLET)
     endif()
 endif()
 
+if (NOT EZVCPKG_BASEDIR)
+    if (DEFINED ENV{EZVCPKG_BASEDIR})
+        set(EZVCPKG_BASEDIR "$ENV{EZVCPKG_BASEDIR}")
+    endif()
+endif()
+
 # Third party dependencies not handled by conan
 add_subdirectory(extern)
 
diff --git a/cmake/Macros.cmake b/cmake/Macros.cmake
index b5342a679..315e9eea3 100644
--- a/cmake/Macros.cmake
+++ b/cmake/Macros.cmake
@@ -321,7 +321,6 @@ $<$<CONFIG:MinSizeRel>:${_EXPECTED_MINSIZEREL_POSTFIX}>")
     if(MSVC)
         # See https://learn.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4530?view=msvc-170
         set(EXTERN_CXX_FLAGS ${EXTERN_CXX_FLAGS} "/EHsc")
-        set(EXTERN_CXX_FLAGS ${EXTERN_CXX_FLAGS} "-D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR=1")
     endif()
 
     # Prepend options with -D
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 1da9b04f5..c06b18ca0 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -253,6 +253,7 @@ add_external_project(
         VCPKG_OVERLAY_PORTS=${VCPKG_OVERLAY_PORTS}
         VCPKG_OVERLAY_TRIPLETS=${VCPKG_OVERLAY_TRIPLETS}
         VCPKG_TRIPLET=${VCPKG_TRIPLET}
+        EZVCPKG_BASEDIR=${EZVCPKG_BASEDIR}
     PROJECT_EXTERN_DIRECTORY
         "${PROJECT_SOURCE_DIR}/extern"
 )
diff --git a/extern/cesium-native b/extern/cesium-native
index edf29c325..d95500238 160000
--- a/extern/cesium-native
+++ b/extern/cesium-native
@@ -1 +1 @@
-Subproject commit edf29c325af7107f6569bd56b371197f44f9e0b7
+Subproject commit d9550023802f1d529b0162733cf8757f9ade017b