Merge pull request #1178 from CesiumGS/works-on-mac-with-cmake4

Several maintenance items

Author: j9liu

.github/workflows/build.yml

@@ -70,7 +70,7 @@ jobs:
           #   sed -n '/warning:/,/^$/p' output.log
 
   Documentation:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Install Doxygen
         run: |
@@ -92,7 +92,7 @@ jobs:
       - name: ccache
         uses: hendrikmuhs/[email protected]
         with:
-          key: ccache-ubuntu-22.04-doxygen
+          key: ccache-ubuntu-24.04-doxygen
       - name: Generate Documentation
         run: |
           npm install

.github/workflows/prod.yml

@@ -6,7 +6,7 @@ on:
       - 'cesium.com-staging'
 jobs:
   deploy-docs:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       AWS_ACCESS_KEY_ID: ${{ secrets.NATIVE_ACCESS_KEY }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.NATIVE_SECRET_KEY }}
@@ -15,9 +15,9 @@ jobs:
       - name: Install Doxygen
         run: |
           cd ~
-          wget https://github.com/doxygen/doxygen/releases/download/Release_1_12_0/doxygen-1.12.0.linux.bin.tar.gz
-          tar xzf doxygen-1.12.0.linux.bin.tar.gz
-          export PATH=$PWD/doxygen-1.12.0/bin:$PATH
+          wget https://github.com/doxygen/doxygen/releases/download/Release_1_13_2/doxygen-1.13.2.linux.bin.tar.gz
+          tar xzf doxygen-1.13.2.linux.bin.tar.gz
+          export PATH=$PWD/doxygen-1.13.2/bin:$PATH
           echo "PATH=$PATH" >> "$GITHUB_ENV"
           doxygen --version
       - name: Check out repository code
@@ -27,15 +27,15 @@ jobs:
       - name: ccache
         uses: hendrikmuhs/[email protected]
         with:
-          key: ccache-ubuntu-22.04-doxygen
+          key: ccache-ubuntu-24.04-doxygen
       - name: Cache vcpkg artifacts
         uses: actions/cache@v4
         with:
           path: ~/.ezvcpkg
-          key:  vcpkg-ubuntu-22.04-doxygen-${{ hashFiles('CMakeLists.txt') }}
+          key:  vcpkg-ubuntu-24.04-doxygen-${{ hashFiles('CMakeLists.txt') }}
           restore-keys: |
-            vcpkg-ubuntu-22.04-doxygen-${{ hashFiles('CMakeLists.txt') }}
-            vcpkg-ubuntu-22.04-doxygen
+            vcpkg-ubuntu-24.04-doxygen-${{ hashFiles('CMakeLists.txt') }}
+            vcpkg-ubuntu-24.04-doxygen
       - name: Mark documentation official
         if: ${{ github.ref_name == 'cesium.com' }}
         run: |

CMakeLists.txt

@@ -66,7 +66,9 @@ if (NOT VCPKG_OVERLAY_PORTS)
     endif()
 endif()
 
-list(APPEND VCPKG_OVERLAY_PORTS "${CMAKE_CURRENT_SOURCE_DIR}/extern/vcpkg/ports")
+if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/extern/vcpkg/ports")
+    list(APPEND VCPKG_OVERLAY_PORTS "${CMAKE_CURRENT_SOURCE_DIR}/extern/vcpkg/ports")
+endif()
 
 message(STATUS "VCPKG_OVERLAY_PORTS ${VCPKG_OVERLAY_PORTS}")
 
@@ -101,7 +103,7 @@ if(CESIUM_USE_EZVCPKG)
     list(APPEND PACKAGES_ALL ${PACKAGES_TEST})
 
     ezvcpkg_fetch(
-        COMMIT 2024.11.16
+        COMMIT dbe35ceb30c688bf72e952ab23778e009a578f18
         PACKAGES ${PACKAGES_ALL}
         # Clean the build trees after building, so that we don't use a ton a disk space on the CI cache
         CLEAN_BUILDTREES

Cesium3DTilesSelection/test/TestTilesetSelectionAlgorithm.cpp

@@ -1742,12 +1742,11 @@ TEST_CASE("Additive-refined tiles are added to the tilesFadingOut array") {
   CHECK(updateResult.tilesToRenderThisFrame.size() == 4);
 
   // Zoom way out
-  std::optional<Cartographic> position = viewState.getPositionCartographic();
-  REQUIRE(position);
-  position->height += 100000;
+  glm::dvec3 position =
+      viewState.getPosition() - 100000.0 * viewState.getDirection();
 
   ViewState zoomedOut = ViewState(
-      Ellipsoid::WGS84.cartographicToCartesian(*position),
+      position,
       viewState.getDirection(),
       viewState.getUp(),
       viewState.getViewportSize(),

extern/vcpkg/ports/README.md

@@ -0,0 +1,2 @@
+We prefer that cesium-native work with a stock release of vcpkg. 
+However, if an overlay port is needed, it can be put in this directory.