diff options
| author | Brad King <brad.king@kitware.com> | 2023-09-06 15:04:32 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-09-06 15:04:39 (GMT) |
| commit | b834e8d53321c2013a7b0d887886862e29bf3486 (patch) | |
| tree | 95cf9e21b3a25e5f2b4529f415904cc21e3704ad | |
| parent | 7de96abcb21cc29b18321cd29c278f4de544ddc3 (diff) | |
| parent | fc419624812f72ee52d045935cf4aa014efb4e0c (diff) | |
| download | CMake-b834e8d53321c2013a7b0d887886862e29bf3486.zip CMake-b834e8d53321c2013a7b0d887886862e29bf3486.tar.gz CMake-b834e8d53321c2013a7b0d887886862e29bf3486.tar.bz2 | |
Merge topic 'ci-vs2022-qt'
fc41962481 ci: Enable Qt tests in nightly VS IDE job
67abc25e67 ci: Factor out location of cmake in Qt download script
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8771
| -rwxr-xr-x | .gitlab/ci/env_windows_vs2022_x64.ps1 | 4 | ||||
| -rwxr-xr-x | .gitlab/ci/qt-env.ps1 | 5 | ||||
| -rw-r--r-- | .gitlab/os-windows.yml | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/.gitlab/ci/env_windows_vs2022_x64.ps1 b/.gitlab/ci/env_windows_vs2022_x64.ps1 new file mode 100755 index 0000000..42aec11 --- /dev/null +++ b/.gitlab/ci/env_windows_vs2022_x64.ps1 @@ -0,0 +1,4 @@ +if ("$env:CMAKE_CI_NIGHTLY" -eq "true") { + $cmake = "build\install\bin\cmake" + . ".gitlab/ci/qt-env.ps1" +} diff --git a/.gitlab/ci/qt-env.ps1 b/.gitlab/ci/qt-env.ps1 index 7eff55f..22b1099 100755 --- a/.gitlab/ci/qt-env.ps1 +++ b/.gitlab/ci/qt-env.ps1 @@ -1,6 +1,9 @@ +if ($cmake -eq $null) { + throw ('$cmake powershell variable not set ') +} if ("$env:PROCESSOR_ARCHITECTURE" -eq "AMD64") { $pwdpath = $pwd.Path - cmake -P .gitlab/ci/download_qt.cmake + & $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") { diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 422e147..81944cb 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -366,6 +366,7 @@ - Set-Item -Force -Path "env:WIX" -Value "$pwdpath\.gitlab\wix" - (& "$pwsh" -File ".gitlab/ci/cmake.ps1") - Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\cmake\bin;$env:PATH" + - $cmake = "cmake" - . .gitlab/ci/ninja-env.ps1 - (& "$env:WIX\bin\light.exe" -help) | Select -First 1 - cmake --version |