Fixes

CesiumGS · Sep 13, 2024 · c23dca3 · c23dca3
1 parent 25dbfda
commit c23dca3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/.github/actions/action.yml b/.github/actions/action.yml
@@ -12,6 +12,7 @@ runs:
     CONAN_USER_HOME: $GITHUB_WORKSPACE
     PM_PACKAGES_ROOT: $GITHUB_WORKSPACE/packman-repo
     EZVCPKG_BASEDIR: $GITHUB_WORKSPACE
+    VCPKG_TRIPLET: "x64-linux"
   args:
     # Tell bash to run a command
     - "-c"

diff --git a/cmake/Macros.cmake b/cmake/Macros.cmake
@@ -321,6 +321,7 @@ $<$<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/cesium-native b/extern/cesium-native