diff options
| author | Brad King <brad.king@kitware.com> | 2023-09-05 19:22:37 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-09-05 19:22:37 (GMT) |
| commit | 67abc25e6716a75814fbc66e38786e498387e6c5 (patch) | |
| tree | ee46aba68492427ca1d2c9ebc13d251d733b14bd /.gitlab | |
| parent | 98e1bea3fa9eb303ec38d6c515bd6a75f725083e (diff) | |
| download | CMake-67abc25e6716a75814fbc66e38786e498387e6c5.zip CMake-67abc25e6716a75814fbc66e38786e498387e6c5.tar.gz CMake-67abc25e6716a75814fbc66e38786e498387e6c5.tar.bz2 | |
ci: Factor out location of cmake in Qt download script
Diffstat (limited to '.gitlab')
| -rwxr-xr-x | .gitlab/ci/qt-env.ps1 | 5 | ||||
| -rw-r--r-- | .gitlab/os-windows.yml | 1 |
2 files changed, 5 insertions, 1 deletions
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 |