fixes

CesiumGS · Sep 13, 2024 · 2b20e61 · 2b20e61
1 parent 6840bbe
commit 2b20e61
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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