mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-25 01:28:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

ci: Factor out location of cmake in Qt download script

Browse Source
This commit is contained in:
Brad King
2023-09-05 15:22:37 -04:00
parent 98e1bea3fa
commit 67abc25e67
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab/ci/qt-env.ps1
+4 -1
View File
@@ -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") {
.gitlab/os-windows.yml
+1
View File
@@ -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