Merge pull request #1679 from CesiumGS/update-native-2025-05-22

Update cesium-native

Author: j9liu

extern/CMakeLists.txt

@@ -145,6 +145,7 @@ endif()
 option(BUILD_SHARED_LIB OFF)
 option(SUPPORT_CONSOLE_APP OFF)
 set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
+set(CMAKE_POLICY_VERSION_MINIMUM "3.5")
 add_subdirectory(tidy-html5)
 
 # Don't build the cesium-native tests by default

extern/cesium-native

@@ -0,0 +1,31 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b206edb6..1db4099d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -30,7 +30,6 @@ option(ADA_TESTING "Build tests" ${BUILD_TESTING})
+ # errors due to CPM, so this is here to support disabling all the testing
+ # and tooling for ada if one only wishes to use the ada library.
+ if(ADA_TESTING OR ADA_BENCHMARKS OR ADA_TOOLS)
+-  include(cmake/CPM.cmake)
+   # CPM requires git as an implicit dependency
+   find_package(Git QUIET)
+   # We use googletest in the tests
+diff --git a/tools/cli/CMakeLists.txt b/tools/cli/CMakeLists.txt
+index ff57220b..a6d90f29 100644
+--- a/tools/cli/CMakeLists.txt
++++ b/tools/cli/CMakeLists.txt
+@@ -8,12 +8,8 @@ if(MSVC AND BUILD_SHARED_LIBS)
+         "$<TARGET_FILE:ada>"      # <--this is in-file
+         "$<TARGET_FILE_DIR:adaparse>")                 # <--this is out-file path
+ endif()
+-CPMAddPackage("gh:fmtlib/fmt#10.2.1")
+-CPMAddPackage(
+-  GITHUB_REPOSITORY jarro2783/cxxopts
+-  VERSION 3.2.0
+-  OPTIONS "CXXOPTS_BUILD_EXAMPLES NO" "CXXOPTS_BUILD_TESTS NO" "CXXOPTS_ENABLE_INSTALL YES"
+-)
++find_package(fmt CONFIG REQUIRED)
++find_package(cxxopts CONFIG REQUIRED)
+ target_link_libraries(adaparse PRIVATE cxxopts::cxxopts fmt::fmt)
+ 
+ if(MSVC OR MINGW)

extern/vcpkg-overlays/ada-url/no-cpm.patch

@@ -0,0 +1,40 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ada-url/ada
+    REF "v${VERSION}"
+    SHA512 bc876db537153d6b0599215ca8be8261bceca6d213fcc63af5fda13c1b32876496cb8d4e98c787f17317cf8ffd1940431551513807f1a18f9ce993fad35f5ec6
+    HEAD_REF main
+    PATCHES
+        no-cpm.patch
+)
+
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        tools ADA_TOOLS
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DADA_BENCHMARKS=OFF
+        -DBUILD_TESTING=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON
+        ${FEATURE_OPTIONS}
+    OPTIONS_DEBUG
+        -DADA_TOOLS=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_copy_pdbs()
+
+vcpkg_cmake_config_fixup(PACKAGE_NAME ada CONFIG_PATH "lib/cmake/ada")
+
+if("tools" IN_LIST FEATURES)
+    vcpkg_copy_tools(TOOL_NAMES adaparse AUTO_CLEAN)
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE-APACHE" "${SOURCE_PATH}/LICENSE-MIT")

extern/vcpkg-overlays/ada-url/portfile.cmake

@@ -0,0 +1,27 @@
+{
+  "name": "ada-url",
+  "version": "2.9.2",
+  "description": "WHATWG-compliant and fast URL parser written in modern C++",
+  "homepage": "https://ada-url.com/",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "tools": {
+      "description": "Build CLI tools (adaparse)",
+      "supports": "!uwp",
+      "dependencies": [
+        "cxxopts",
+        "fmt"
+      ]
+    }
+  }
+}

extern/vcpkg-overlays/ada-url/vcpkg.json

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ffcbe95..7b13753 100644
+index 8f0fff3..9875e97 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -490,7 +490,7 @@ macro(common_libktx_settings target enable_write library_type)
+@@ -505,7 +505,7 @@ macro(common_libktx_settings target enable_write library_type)
      target_compile_definitions(
          ${target}
      PUBLIC

extern/vcpkg-overlays/asyncplusplus/portfile.cmake

@@ -1,9 +1,9 @@
-vcpkg_from_git(
+vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    URL "https://github.com/KhronosGroup/KTX-Software.git"
-    REF 91ace88675ac59a97e55d0378a6602a9ae6b98bd
-    FETCH_REF "v${VERSION}"
-    HEAD_REF main
+    REPO KhronosGroup/KTX-Software
+    REF "v${VERSION}"
+    SHA512 0077315fe2b4e676e97e3a158c2c6e1f6ba426e14ad23342592cd69be28cfce64c40614e0a84d58a9634877ab334e713b94d4c962132c98bfea308e91bc8a98a
+    HEAD_REF master
     PATCHES
         0001-Use-vcpkg-zstd.patch
         0002-Fix-versioning.patch
@@ -14,6 +14,8 @@ vcpkg_from_git(
         CESIUM-0001-do-not-define-_DEBUG.patch
 )
 file(REMOVE "${SOURCE_PATH}/other_include/zstd_errors.h")
+file(REMOVE_RECURSE "${SOURCE_PATH}/external/basisu/zstd")
+file(REMOVE_RECURSE "${SOURCE_PATH}/lib/basisu/zstd")
 
 vcpkg_list(SET OPTIONS)
 if(VCPKG_TARGET_IS_WINDOWS)

extern/vcpkg-overlays/asyncplusplus/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "ktx",
   "version-semver": "4.3.2",
+  "port-version": 2,
   "description": [
     "The Khronos KTX library and tools.",
     "Functions for writing and reading KTX files, and instantiating OpenGL®, OpenGL ES™️ and Vulkan® textures from them."