diff options
| author | Brad King <brad.king@kitware.com> | 2022-11-11 12:03:23 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-11-11 15:05:30 -0500 |
| commit | 09c1b1db078022096d9b671ebd5ad6bb7a4b52fd (patch) | |
| tree | e97c03be5dc60a1eab9bb42c4aecd288f6606908 /.gitlab/ci | |
| parent | 61ebd7d083430ed55ad263b96e73efd91dcfa2ab (diff) | |
| download | cmake-09c1b1db078022096d9b671ebd5ad6bb7a4b52fd.tar.gz | |
gitlab-ci: Add windows-arm64 native jobs for Ninja and VS
Add Windows ARM64 native CI jobs to build and test with Ninja,
and to test with VS.
Issue: #23624
Diffstat (limited to '.gitlab/ci')
| -rw-r--r-- | .gitlab/ci/configure_windows_arm64_vs2022.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/configure_windows_arm64_vs2022_ninja.cmake | 7 | ||||
| -rwxr-xr-x | .gitlab/ci/qt-env.ps1 | 14 |
3 files changed, 18 insertions, 4 deletions
diff --git a/.gitlab/ci/configure_windows_arm64_vs2022.cmake b/.gitlab/ci/configure_windows_arm64_vs2022.cmake new file mode 100644 index 0000000000..c7d41ea1d4 --- /dev/null +++ b/.gitlab/ci/configure_windows_arm64_vs2022.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_vs_common.cmake") diff --git a/.gitlab/ci/configure_windows_arm64_vs2022_ninja.cmake b/.gitlab/ci/configure_windows_arm64_vs2022_ninja.cmake new file mode 100644 index 0000000000..722e009b11 --- /dev/null +++ b/.gitlab/ci/configure_windows_arm64_vs2022_ninja.cmake @@ -0,0 +1,7 @@ +# Qt host tools are not yet available natively on windows-arm64. +set(CMake_TEST_GUI "OFF" CACHE BOOL "") +set(BUILD_QtDialog "OFF" CACHE BOOL "") +set(CMAKE_PREFIX_PATH "" CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_msvc_cxx_modules_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_vs_common_ninja.cmake") diff --git a/.gitlab/ci/qt-env.ps1 b/.gitlab/ci/qt-env.ps1 index c087a59a97..7eff55fc44 100755 --- a/.gitlab/ci/qt-env.ps1 +++ b/.gitlab/ci/qt-env.ps1 @@ -1,4 +1,10 @@ -$pwdpath = $pwd.Path -cmake -P .gitlab/ci/download_qt.cmake -Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\qt\bin;$env:PATH" -qmake -v +if ("$env:PROCESSOR_ARCHITECTURE" -eq "AMD64") { + $pwdpath = $pwd.Path + cmake -P .gitlab/ci/download_qt.cmake + Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\qt\bin;$env:PATH" + qmake -v +} elseif ("$env:PROCESSOR_ARCHITECTURE" -eq "ARM64") { + # Qt host tools are not yet available natively on windows-arm64. +} else { + throw ('unknown PROCESSOR_ARCHITECTURE: ' + "$env:PROCESSOR_ARCHITECTURE") +} |