diff options
| author | Brad King <brad.king@kitware.com> | 2022-11-11 16:40:37 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-11-11 20:05:30 (GMT) |
| commit | 781303c0e263b2497829a8f7c2160d223faa8509 (patch) | |
| tree | 53211045795bf09ee07df4d754176516fd0acfce | |
| parent | b0d16c7f7404bfa9979680b5bb4994441a6c0faa (diff) | |
| download | CMake-781303c0e263b2497829a8f7c2160d223faa8509.zip CMake-781303c0e263b2497829a8f7c2160d223faa8509.tar.gz CMake-781303c0e263b2497829a8f7c2160d223faa8509.tar.bz2 | |
ci: Factor out helper to load qt into environment on Windows
| -rwxr-xr-x | .gitlab/ci/qt-env.ps1 | 4 | ||||
| -rw-r--r-- | .gitlab/os-windows.yml | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/.gitlab/ci/qt-env.ps1 b/.gitlab/ci/qt-env.ps1 new file mode 100755 index 0000000..c087a59 --- /dev/null +++ b/.gitlab/ci/qt-env.ps1 @@ -0,0 +1,4 @@ +$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 diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 1979aa4..eb063f8 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -304,8 +304,7 @@ - . .gitlab/ci/ninja-env.ps1 - (& "$env:WIX\bin\light.exe" -help) | Select -First 1 - cmake --version - - cmake -P .gitlab/ci/download_qt.cmake - - Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\qt\bin;$env:PATH" + - . .gitlab/ci/qt-env.ps1 - cmake -P .gitlab/ci/download_python3.cmake - Set-Item -Force -Path "env:PATH" -Value "$pwdpath\.gitlab\python3;$env:PATH" - python --version |