Use cesium-native main, update abseil portfile

CesiumGS · Nov 25, 2024 · 6a44c2f · 6a44c2f
1 parent 6c3fbb0
commit 6a44c2f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/extern/cesium-native b/extern/cesium-native
diff --git a/extern/vcpkg-overlays/abseil/portfile.cmake b/extern/vcpkg-overlays/abseil/portfile.cmake
@@ -27,16 +27,6 @@ endif()
 # Don't let Abseil clobber our CMAKE_MSVC_RUNTIME_LIBRARY choice.
 vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "set(CMAKE_MSVC_RUNTIME_LIBRARY \"MultiThreaded$<$<CONFIG:Debug>:Debug>DLL\")" "#set(CMAKE_MSVC_RUNTIME_LIBRARY \"MultiThreaded$<$<CONFIG:Debug>:Debug>DLL\")")
 
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    DISABLE_PARALLEL_CONFIGURE
-    OPTIONS
-        -DABSL_PROPAGATE_CXX_STD=OFF
-        -DCMAKE_CXX_STANDARD=14
-        ${ABSL_USE_CXX17_OPTION}
-        ${ABSL_STATIC_RUNTIME_OPTION}
-)
-
 # Don't let our customized version of Abseil pose as the real thing.
 vcpkg_replace_string("${SOURCE_PATH}/absl/base/options.h" "ABSL_OPTION_INLINE_NAMESPACE_NAME lts_20240722" "ABSL_OPTION_INLINE_NAMESPACE_NAME lts_20240722_cesium_for_unreal")
 vcpkg_replace_string("${SOURCE_PATH}/absl/base/options.h" "ABSL_OPTION_USE_STD_ANY 2" "ABSL_OPTION_USE_STD_ANY 0")
@@ -52,6 +42,16 @@ vcpkg_replace_string("${SOURCE_PATH}/absl/base/config.h" "#define ABSL_LTS_RELEA
 vcpkg_replace_string("${SOURCE_PATH}/absl/time/time.h" "__cpp_impl_three_way_comparison" "__cpp_lib_three_way_comparison")
 vcpkg_replace_string("${SOURCE_PATH}/absl/strings/cord.h" "__cpp_impl_three_way_comparison" "__cpp_lib_three_way_comparison")
 
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_PARALLEL_CONFIGURE
+    OPTIONS
+        -DABSL_PROPAGATE_CXX_STD=OFF
+        -DCMAKE_CXX_STANDARD=14
+        ${ABSL_USE_CXX17_OPTION}
+        ${ABSL_STATIC_RUNTIME_OPTION}
+)
+
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(PACKAGE_NAME absl CONFIG_PATH lib/cmake/absl)
 vcpkg_fixup_pkgconfig()
+1 −0		CHANGES.md
+14 −0		CesiumGltf/test/TestJsonValue.cpp
+7 −0		CesiumUtility/include/CesiumUtility/JsonValue.h
+7 −0		doc/CMakeLists.txt
+2,314 −0		doc/assets/mermaid.min.js
+12,323 −0		doc/assets/mingcute.json.js
+31 −0		doc/footer.html