Vcpkg manifest

.github/workflows/build.yml

@@ -48,7 +48,7 @@ jobs:
       # These are specified in the Unreal Engine release notes under "IDE Version the Build farm compiles against"
       # and using them ensures we're compiling our plugin in the exact same way that Unreal Engine itself is compiled.
       cmake-generator: "Visual Studio 17 2022"
-      cmake-toolchain: "version=14.34"
+      cmake-toolchain: "14.34"
       cmake-platform: "x64,version=10.0.18362.0"
       visual-studio-version: "2022"
       visual-studio-components: "Microsoft.VisualStudio.Component.VC.14.34.17.4.x86.x64,Microsoft.VisualStudio.Component.Windows10SDK.18362"
@@ -166,7 +166,7 @@ jobs:
       # These are specified in the Unreal Engine release notes under "IDE Version the Build farm compiles against"
       # and using them ensures we're compiling our plugin in the exact same way that Unreal Engine itself is compiled.
       cmake-generator: "Visual Studio 17 2022"
-      cmake-toolchain: "version=14.34"
+      cmake-toolchain: "14.34"
       cmake-platform: "x64,version=10.0.18362.0"
       visual-studio-version: "2022"
       visual-studio-components: "Microsoft.VisualStudio.Component.VC.14.34.17.4.x86.x64,Microsoft.VisualStudio.Component.Windows10SDK.18362"
@@ -284,7 +284,7 @@ jobs:
       # These are specified in the Unreal Engine release notes under "IDE Version the Build farm compiles against"
       # and using them ensures we're compiling our plugin in the exact same way that Unreal Engine itself is compiled.
       cmake-generator: "Visual Studio 17 2022"
-      cmake-toolchain: "version=14.38"
+      cmake-toolchain: "14.38"
       cmake-platform: "x64,version=10.0.22621.0"
       visual-studio-version: "2022"
       visual-studio-components: "Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64,Microsoft.VisualStudio.Component.Windows11SDK.22621"

.github/workflows/buildAndroid.yml

@@ -25,6 +25,8 @@ on:
       android-ndk-version:
         required: true
         type: string
+env:
+  VCPKG_BINARY_SOURCES: 'clear;x-aws,s3://cesium-builds/vcpkg/cesium-unreal-cache/,readwrite'
 jobs:
   build:
     runs-on: ${{ inputs.runner-label }}
@@ -63,15 +65,22 @@ jobs:
           unreal-program-name: ${{ inputs.unreal-program-name }}
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      - name: Capture AWS secrets for vcpkg cache
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_INTERNAL_SERVICES_VCPKG_ACCESS_KEY }}
+          aws-secret-access-key: ${{ secrets.AWS_INTERNAL_SERVICES_VCPKG_SECRET_KEY }}
+          aws-region: us-east-1
       - name: Build cesium-native
         run: |
           # CMake gets confused by the Windows backslashes
           $env:ANDROID_NDK_ROOT=$env:ANDROID_NDK_ROOT.replace('\', '/')
           $env:ANDROID_NDK_HOME=$env:ANDROID_NDK_ROOT
           $env:UNREAL_ENGINE_ROOT="D:/Program Files/Epic Games/${{ inputs.unreal-program-name }}"
           $env:CESIUM_VCPKG_RELEASE_ONLY="TRUE"
+          $env:VCPKG_ROOT="$env:VCPKG_INSTALLATION_ROOT"
           cd extern
-          cmake -B build-android -S . -G Ninja -DCMAKE_TOOLCHAIN_FILE="unreal-android-toolchain.cmake" -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release
+          cmake -B build-android --preset=arm64-android -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release
           cmake --build build-android --config Release --target install -j8
           cd ..
           rm -r -fo extern

.github/workflows/buildApple.yml

@@ -21,6 +21,8 @@ on:
       xcode-version:
         required: true
         type: string
+env:
+  VCPKG_BINARY_SOURCES: 'clear;x-aws,s3://cesium-builds/vcpkg/cesium-unreal-cache/,readwrite'
 jobs:
   build:
     runs-on: ${{ inputs.runner-label }}
@@ -72,10 +74,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
-      - name: Configure vcpkg caching
-        uses: ./.github/actions/vcpkg-cache
-        with:
-          id: ${{ inputs.upload-package-base-name }}
       - name: Install Unreal Engine
         uses: ./.github/actions/install-unreal-macos
         with:
@@ -90,24 +88,41 @@ jobs:
           # Make these available to subsequent steps
           echo "CESIUM_UNREAL_VERSION=${CESIUM_UNREAL_VERSION}" >> $GITHUB_ENV
           echo "BUILD_CESIUM_UNREAL_PACKAGE_NAME=${BUILD_CESIUM_UNREAL_PACKAGE_NAME}" >> $GITHUB_ENV
+          echo "CESIUM_VCPKG_DIR=${HOME}/vcpkg" >> $GITHUB_ENV
       - name: Install nasm
         uses: ilammy/setup-nasm@v1.5.1
+      - name: Capture AWS secrets for vcpkg cache
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_INTERNAL_SERVICES_VCPKG_ACCESS_KEY }}
+          aws-secret-access-key: ${{ secrets.AWS_INTERNAL_SERVICES_VCPKG_SECRET_KEY }}
+          aws-region: us-east-1
+      - name: Install ninja
+        run: |
+          brew install ninja
+      - name: Install vcpkg
+        uses: lukka/run-vcpkg@v11
+        with:
+          vcpkgDirectory: ${{ env.CESIUM_VCPKG_DIR }}
+          vcpkgGitCommitId: d5ec528843d29e3a52d745a64b469f810b2cedbf
+      - name: Print output from run-vcpkg (debugging)
+        run: >
+          echo "root='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_ROOT_OUT }}', triplet='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_DEFAULT_TRIPLET_OUT }}'"
       - name: Build cesium-native for macOS ARM64
         run: |
           export UNREAL_ENGINE_ROOT=$HOME/${{ inputs.unreal-program-name }}
           export CESIUM_VCPKG_RELEASE_ONLY=TRUE
-          mkdir -p extern/build-arm64
-          cd extern/build-arm64
-          cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_SYSTEM_PROCESSOR=arm64
-          cmake --build . -j4 --target install
+          cd extern
+          cmake -B build-arm64 --preset=arm64-osx -DCMAKE_BUILD_TYPE=Release
+          cmake --build build-arm64 -j4 --target install
       - name: Build cesium-native for macOS x86_64
         run: |
           export UNREAL_ENGINE_ROOT=$HOME/${{ inputs.unreal-program-name }}
           export CESIUM_VCPKG_RELEASE_ONLY=TRUE
           mkdir -p extern/build-x64
-          cd extern/build-x64
-          cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_SYSTEM_PROCESSOR=x86_64
-          cmake --build . -j4 --target install
+          cd extern
+          cmake -B build-x64 --preset=x64-osx -DCMAKE_BUILD_TYPE=Release
+          cmake --build build-x64 -j4 --target install
       - name: Create universal macOS libs for cesium-native
         run: |
           mkdir -p ${GITHUB_WORKSPACE}/Source/ThirdParty/lib/Darwin-universal-Release
@@ -131,7 +146,7 @@ jobs:
           cd extern
           export UNREAL_ENGINE_ROOT=$HOME/${{ inputs.unreal-program-name }}
           export CESIUM_VCPKG_RELEASE_ONLY=TRUE
-          cmake -B build-ios -S . -GXcode -DCMAKE_TOOLCHAIN_FILE="unreal-ios-toolchain.cmake" -DCMAKE_BUILD_TYPE=Release
+          cmake -B build-ios --preset=arm64-ios -GXcode -DCMAKE_BUILD_TYPE=Release
           cmake --build build-ios -j4 --target install --config Release
       - name: Remove extern directory
         run: |
@@ -145,6 +160,8 @@ jobs:
       - name: Print log
         if: ${{ failure() }}
         run: |
+          cat "/Users/runner/vcpkg/buildtrees/detect_compiler/config-arm64-osx-rel-out.log"
+          cat "/Users/runner/vcpkg/buildtrees/detect_compiler/config-arm64-osx-rel-err.log"
           cat "/Users/runner/Library/Logs/Unreal Engine/LocalBuildLogs/UBT-UnrealEditor-Mac-Development.txt"
       - name: Publish plugin package artifact
         if: ${{ success() }}

.github/workflows/buildLinux.yml

@@ -25,6 +25,8 @@ on:
       clang-version:
         required: true
         type: string
+env:
+  VCPKG_BINARY_SOURCES: 'clear;x-aws,s3://cesium-builds/vcpkg/cesium-unreal-cache/,readwrite'
 jobs:
   build:
     runs-on: ${{ inputs.runner-label }}
@@ -60,14 +62,12 @@ jobs:
           unreal-program-name: ${{ inputs.unreal-program-name }}
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      - name: Configure vcpkg caching
-        uses: ./.github/actions/vcpkg-cache
+      - name: Capture AWS secrets for vcpkg cache
+        uses: aws-actions/configure-aws-credentials@v4
         with:
-          id: ${{ inputs.upload-package-base-name }}
-      - name: Check out repository code
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
+          aws-access-key-id: ${{ secrets.AWS_INTERNAL_SERVICES_VCPKG_ACCESS_KEY }}
+          aws-secret-access-key: ${{ secrets.AWS_INTERNAL_SERVICES_VCPKG_SECRET_KEY }}
+          aws-region: us-east-1
       - name: Install Ninja and patchelf
         run: |
           sudo apt install -y ninja-build patchelf
@@ -81,10 +81,11 @@ jobs:
         run: |
           export UNREAL_ENGINE_COMPILER_DIR="${LINUX_MULTIARCH_ROOT}x86_64-unknown-linux-gnu"
           export UNREAL_ENGINE_LIBCXX_DIR="${UNREAL_ENGINE_ROOT}/Engine/Source/ThirdParty/Unix/LibCxx"
+          export VCPKG_ROOT="${VCPKG_INSTALLATION_ROOT}"
           export CESIUM_VCPKG_RELEASE_ONLY=TRUE
           cd extern
-          cmake -B build -S . -G Ninja -DCMAKE_TOOLCHAIN_FILE="unreal-linux-toolchain.cmake" -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release
-          cmake --build build --config Release --target install -j8
+          cmake --preset linux -DCMAKE_BUILD_TYPE=Release
+          cmake --build out/build/linux --config Release --target install -j8
           cd ..
           rm -rf extern
       - name: Make more swap space available

.github/workflows/buildWindows.yml

@@ -45,6 +45,8 @@ on:
         required: false
         type: string
         default: "x64"
+env:
+  VCPKG_BINARY_SOURCES: 'clear;x-aws,s3://cesium-builds/vcpkg/cesium-unreal-cache/,readwrite'
 jobs:
   build:
     runs-on: ${{ inputs.runner-label }}
@@ -69,10 +71,6 @@ jobs:
         if: ${{ inputs.extra-choco-packages }}
         run: |
           choco install -y ${{ inputs.extra-choco-packages }}
-      - name: Configure vcpkg caching
-        uses: ./.github/actions/vcpkg-cache
-        with:
-          id: ${{ inputs.upload-package-base-name }}
       - name: Set environment variables
         run: |
           $env:CESIUM_UNREAL_VERSION=$env:GITHUB_REF_NAME
@@ -100,13 +98,25 @@ jobs:
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       - name: Install nasm
         uses: ilammy/setup-nasm@v1.5.1
+      - name: Capture AWS secrets for vcpkg cache
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_INTERNAL_SERVICES_VCPKG_ACCESS_KEY }}
+          aws-secret-access-key: ${{ secrets.AWS_INTERNAL_SERVICES_VCPKG_SECRET_KEY }}
+          aws-region: us-east-1
       - name: Build cesium-native
         run: |
           cd extern
           $env:UNREAL_ENGINE_ROOT="D:/Program Files/Epic Games/${{ inputs.unreal-program-name }}"
           $env:CESIUM_VCPKG_RELEASE_ONLY="TRUE"
-          $toolchainOption=If ("${{ inputs.cmake-toolchain }}") {"-T ${{ inputs.cmake-toolchain }}"} Else {""}
-          cmake -B build -S . -A "${{ inputs.cmake-platform }}" -G "${{ inputs.cmake-generator }}" $toolchainOption
+          $env:VCPKG_ROOT="$env:VCPKG_INSTALLATION_ROOT"
+          $env:CESIUM_TOOLSET_VERSION="${{ inputs.cmake-toolchain }}"
+          if ($env:CESIUM_TOOLSET_VERSION) {
+            cmake -B build -S . -T "version=${{ inputs.cmake-toolchain}}" -A "${{ inputs.cmake-platform }}" --preset Windows-CI-Versioned
+          }
+          else {
+            cmake -B build -S . -A "${{ inputs.cmake-platform }}" -preset Windows-CI
+          }
           cmake --build build --config Release --target install -j8
           cd ..
           rm -r -fo extern

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "extern/cesium-native"]
-	path = extern/cesium-native
-	url = ../cesium-native.git
 [submodule "extern/MikkTSpace"]
 	path = extern/MikkTSpace
 	url = https://github.com/mmikk/MikkTSpace.git

extern/CMakeLists.txt

@@ -6,6 +6,9 @@ project(
     LANGUAGES CXX C
 )
 
+# XXX Not working yet
+set(CESIUM_UNREAL_NATIVE_DIRECTORY "" CACHE PATH "directory for Cesium Native source if not installed via package manager")
+
 if (DEFINED ENV{UNREAL_ENGINE_ROOT} AND NOT UNREAL_ENGINE_ROOT)
   set(UNREAL_ENGINE_ROOT "$ENV{UNREAL_ENGINE_ROOT}")
 endif()
@@ -57,6 +60,7 @@ set(PRIVATE_CESIUM_SQLITE ON)
 set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreadedDLL)
 set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_LIST_DIR}/../Source/ThirdParty)
 set(CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}-$<IF:$<CONFIG:Debug>,Debug,Release>)
+set(CMAKE_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include)
 
 # Always define NDEBUG, since Unreal does in debug anyway.
 # We don't want any mismatches, especially with class member ordering.
@@ -105,28 +109,37 @@ if (CESIUM_USE_UNREAL_TRACING)
   list(APPEND CESIUM_EXTRA_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/include")
 endif()
 
-# vcpkg setup
-set(ENV{VCPKG_OVERLAY_PORTS} "${CMAKE_CURRENT_LIST_DIR}/vcpkg-overlays")
-set(ENV{VCPKG_OVERLAY_TRIPLETS} "${CMAKE_CURRENT_LIST_DIR}/vcpkg-overlays/triplets")
-
-include(${CMAKE_CURRENT_SOURCE_DIR}/cesium-native/cmake/detect-vcpkg-triplet.cmake)
-
-if (NOT VCPKG_TRIPLET)
-    if (DEFINED ENV{VCPKG_TRIPLET})
-        set(VCPKG_TRIPLET "$ENV{VCPKG_TRIPLET}")
-    elseif(DETECTED_VCPKG_TRIPLET_ERROR)
-        message(FATAL_ERROR "${DETECTED_VCPKG_TRIPLET_ERROR}")
-    else()
-        set(VCPKG_TRIPLET "${DETECTED_VCPKG_TRIPLET}-unreal")
-    endif()
-endif()
-
 # Our OpenSSL is part of Unreal Engine, so need to install it.
 set(CESIUM_EXCLUDE_INSTALL_HEADERS openssl)
 set(CESIUM_EXCLUDE_INSTALL_STATIC_LIBS openssl)
 SET(CESIUM_DISABLE_CURL ON)
 
-add_subdirectory(cesium-native)
+if(CESIUM_UNREAL_NATIVE_DIRECTORY)
+  # These packages are used in the public headers of Cesium libraries, so we need to distribute the headers and binaries
+  # with the installation
+  # Note that fmt is a public dependency of the vcpkg version of spdlog
+  # STB and uriparser aren't technically part of the public interface, but they're used by the downstream Cesium for Unreal project
+  set(PACKAGES_PUBLIC asyncplusplus expected-lite fmt glm rapidjson spdlog stb uriparser)
+  # These packages are used in the code and produce binaries, but are not part of the public interface.  Therefore we need
+  # to distribute the binaries for linking, but not the headers, as downstream consumers don't need them
+  # OpenSSL and abseil are both dependencies of s2geometry
+  set(PACKAGES_PRIVATE
+    abseil draco ktx modp-base64 meshoptimizer openssl s2geometry
+    libjpeg-turbo sqlite3 tinyxml2 libwebp zlib-ng picosha2
+    earcut-hpp cpp-httplib[core] libmorton zstd
+  )
+  # Packages only used for testing
+  set(PACKAGES_TEST catch2)
+
+  set(PACKAGES_ALL ${PACKAGES_PUBLIC})
+  list(APPEND PACKAGES_ALL ${PACKAGES_PRIVATE})
+  list(APPEND PACKAGES_ALL ${PACKAGES_TEST})
+  add_subdirectory("${CESIUM_UNREAL_NATIVE_DIRECTORY}" cesium-native)
+  # Don't build the cesium-native tests by default
+  set_target_properties(cesium-native-tests PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1)
+else()
+  find_package(cesium-native)
+endif()
 
 # cesium-native doesn't require this header to be public, but Cesium for Unreal wants to use it.
 #install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cesium-native/extern/stb/stb_image_resize.h TYPE INCLUDE)
@@ -149,8 +162,23 @@ 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
-set_target_properties(cesium-native-tests PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1)
-
 add_subdirectory(swl-variant)
 install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/swl-variant/include/" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
+if(VCPKG_INSTALLED_DIR)
+    set(CESIUM_VCPKG_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}")
+    set(CESIUM_VCPKG_LIBDIR "${CESIUM_VCPKG_DIR}/$<IF:$<CONFIG:Debug>,debug/lib,lib>")
+
+    message(STATUS "CESIUM_VCPKG_LIBDIR: ${CESIUM_VCPKG_LIBDIR}")
+
+    install(DIRECTORY "${CESIUM_VCPKG_LIBDIR}/"
+            DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+            PATTERN libcrypto.* EXCLUDE
+            PATTERN libssl.* EXCLUDE
+            )
+
+    install(DIRECTORY "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/"
+            DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+            PATTERN openssl EXCLUDE
+            )
+endif()