-
Notifications
You must be signed in to change notification settings - Fork 295
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1447 from CesiumGS/vcpkg
Use the vcpkg-enabled version of cesium-native.
- Loading branch information
Showing
83 changed files
with
1,616 additions
and
592 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
.github/actions/install-unreal-macos/exclude-from-unzip.lst
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| UE_5.2/Engine/Binaries/Mac/LiveLinkHub-Mac-Shipping.app/* | ||
| UE_5.2/Engine/Binaries/Mac/UnrealGame-Mac-DebugGame.app/* | ||
| UE_5.2/Engine/Binaries/Mac/UnrealGame.app/* | ||
| UE_5.2/Engine/Binaries/Mac/UnrealGame-Mac-Shipping.app/* | ||
| UE_5.2/Engine/Binaries/Mac/Android/* | ||
| UE_5.2/Engine/Binaries/Mac/UnrealGame-Mac-DebugGame | ||
| UE_5.2/Engine/Binaries/Mac/UnrealGame | ||
| UE_5.2/Engine/Binaries/Mac/UnrealGame-Mac-Shipping | ||
| UE_5.2/Engine/Binaries/Mac/*.dSYM | ||
| UE_5.2/Engine/Plugins/Experimental/NNERuntimeIREE/* | ||
| UE_5.2/Engine/Plugins/Experimental/Avalanche/* | ||
| UE_5.3/Engine/Binaries/Mac/LiveLinkHub-Mac-Shipping.app/* | ||
| UE_5.3/Engine/Binaries/Mac/UnrealGame-Mac-DebugGame.app/* | ||
| UE_5.3/Engine/Binaries/Mac/UnrealGame.app/* | ||
| UE_5.3/Engine/Binaries/Mac/UnrealGame-Mac-Shipping.app/* | ||
| UE_5.3/Engine/Binaries/Mac/Android/* | ||
| UE_5.3/Engine/Binaries/Mac/UnrealGame-Mac-DebugGame | ||
| UE_5.3/Engine/Binaries/Mac/UnrealGame | ||
| UE_5.3/Engine/Binaries/Mac/UnrealGame-Mac-Shipping | ||
| UE_5.3/Engine/Binaries/Mac/*.dSYM | ||
| UE_5.3/Engine/Plugins/Experimental/NNERuntimeIREE/* | ||
| UE_5.3/Engine/Plugins/Experimental/Avalanche/* | ||
| UE_5.4/Engine/Binaries/Mac/LiveLinkHub-Mac-Shipping.app/* | ||
| UE_5.4/Engine/Binaries/Mac/UnrealGame-Mac-DebugGame.app/* | ||
| UE_5.4/Engine/Binaries/Mac/UnrealGame.app/* | ||
| UE_5.4/Engine/Binaries/Mac/UnrealGame-Mac-Shipping.app/* | ||
| UE_5.4/Engine/Binaries/Mac/Android/* | ||
| UE_5.4/Engine/Binaries/Mac/ZenDashboard.app/* | ||
| UE_5.4/Engine/Binaries/Mac/UnrealEditorServices.app/* | ||
| UE_5.4/Engine/Binaries/Mac/UnrealEditor-Mac-DebugGame.app/* | ||
| UE_5.4/Engine/Binaries/Mac/UnrealGame-Mac-DebugGame | ||
| UE_5.4/Engine/Binaries/Mac/UnrealGame | ||
| UE_5.4/Engine/Binaries/Mac/UnrealGame-Mac-Shipping | ||
| UE_5.4/Engine/Binaries/ThirdParty/DotNet/6.0.302/mac-x64/* | ||
| UE_5.4/Engine/Binaries/ThirdParty/CEF3/* | ||
| UE_5.4/Engine/Binaries/DotNET/AutomationTool/AutomationScripts/Platforms/Windows/* | ||
| UE_5.4/Engine/Intermediate/ScriptModules/Win.Automation.json | ||
| UE_5.4/Engine/Binaries/DotNET/AutomationTool/AutomationScripts/Platforms/Android/* | ||
| UE_5.4/Engine/Intermediate/ScriptModules/Android.Automation.json | ||
| UE_5.4/Engine/Binaries/DotNET/AutomationTool/AutomationScripts/Platforms/Linux/* | ||
| UE_5.4/Engine/Intermediate/ScriptModules/Linux.Automation.json | ||
| UE_5.4/Engine/Binaries/DotNET/AutomationTool/AutomationScripts/Platforms/TVOS/* | ||
| UE_5.4/Engine/Intermediate/ScriptModules/TVOS.Automation.json | ||
| UE_5.4/Engine/Binaries/DotNET/AutomationTool/AutomationScripts/Platforms/SteamDeck/* | ||
| UE_5.4/Engine/Intermediate/ScriptModules/SteamDeck.Automation.json | ||
| UE_5.4/Engine/Binaries/DotNET/Android/* | ||
| *.dSYM |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| name: Configure vcpkg caching | ||
| inputs: | ||
| id: | ||
| required: true | ||
| type: string | ||
| runs: | ||
| using: composite | ||
| steps: | ||
| - name: Cache vcpkg artifacts | ||
| uses: actions/cache@v4 | ||
| with: | ||
| path: ${{ runner.os == 'Windows' && '/.ezvcpkg' || '~/.ezvcpkg' }} | ||
| key: vcpkg-${{ inputs.id }}-${{ hashFiles('extern/vcpkg-overlays/**/vcpkg.json', 'extern/vcpkg-overlays/triplets/**/*', 'extern/*toolchain.cmake') }}-${{ hashFiles('extern/cesium-native/CMakeLists.txt', 'extern/CMakeLists.txt') }} | ||
| restore-keys: | | ||
| vcpkg-${{ inputs.id }}-${{ hashFiles('extern/vcpkg-overlays/**/vcpkg.json', 'extern/vcpkg-overlays/triplets/**/*', 'extern/*toolchain.cmake') }}- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -43,6 +43,10 @@ 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: Set environment variables | ||
| run: | | ||
| $env:CESIUM_UNREAL_VERSION=$env:GITHUB_REF_NAME | ||
|
|
@@ -52,25 +56,28 @@ jobs: | |
| echo "BUILD_CESIUM_UNREAL_PACKAGE_NAME=${ENV:BUILD_CESIUM_UNREAL_PACKAGE_NAME}" >> $ENV:GITHUB_ENV | ||
| - name: Install nasm | ||
| uses: ilammy/[email protected] | ||
| - name: Install Unreal Engine | ||
| uses: ./.github/actions/install-unreal-windows | ||
| with: | ||
| unreal-engine-zip: ${{ inputs.unreal-engine-zip }} | ||
| 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: 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" | ||
| 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 --build build-android --config Release --target install -j8 | ||
| cd .. | ||
| rm -r -fo extern | ||
| - name: Install Unreal Engine | ||
| uses: ./.github/actions/install-unreal-windows | ||
| with: | ||
| unreal-engine-zip: ${{ inputs.unreal-engine-zip }} | ||
| 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: Overwrite plugin engine version | ||
| run: | | ||
| ((Get-Content -path CesiumForUnreal.uplugin -Raw) -replace '"EngineVersion": "5.1.0"','"EngineVersion": "${{ inputs.unreal-engine-version }}"') | Set-Content -Path CesiumForUnreal.uplugin | ||
| ((Get-Content -path CesiumForUnreal.uplugin -Raw) -replace '"EngineVersion": "5.2.0"','"EngineVersion": "${{ inputs.unreal-engine-version }}"') | Set-Content -Path CesiumForUnreal.uplugin | ||
| - name: Customize BuildConfiguration.xml | ||
| run: | | ||
| mkdir -p "$env:USERPROFILE\AppData\Roaming\Unreal Engine\UnrealBuildTool" | ||
|
|
@@ -92,10 +99,6 @@ jobs: | |
| if: ${{ failure() }} | ||
| run: | | ||
| cat "C:\Users\runneradmin\AppData\Roaming\Unreal Engine\AutomationTool\Logs\D+Program+Files+Epic+Games+${{ inputs.unreal-program-name }}\UBT-UnrealGame-Android-Development.txt" | ||
| - name: Compress debug sections | ||
| run: | | ||
| dir packages/CesiumForUnreal/Intermediate/Build/Android/UnrealGame/Development/CesiumRuntime/*.o | Foreach-Object { & $ENV:ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/windows-x86_64/bin/llvm-objcopy.exe --compress-debug-sections $_.FullName } | ||
| dir packages/CesiumForUnreal/Intermediate/Build/Android/UnrealGame/Shipping/CesiumRuntime/*.o | Foreach-Object { & $ENV:ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/windows-x86_64/bin/llvm-objcopy.exe --compress-debug-sections $_.FullName } | ||
| - name: Publish plugin package artifact | ||
| if: ${{ success() }} | ||
| uses: actions/upload-artifact@v4 | ||
|
|
||
Oops, something went wrong.