summaryrefslogtreecommitdiff
path: root/.gitlab/os-windows.yml
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-11-11 11:40:37 -0500
committerBrad King <brad.king@kitware.com>2022-11-11 15:05:30 -0500
commit781303c0e263b2497829a8f7c2160d223faa8509 (patch)
tree53211045795bf09ee07df4d754176516fd0acfce /.gitlab/os-windows.yml
parentb0d16c7f7404bfa9979680b5bb4994441a6c0faa (diff)
downloadcmake-781303c0e263b2497829a8f7c2160d223faa8509.tar.gz
ci: Factor out helper to load qt into environment on Windows
Diffstat (limited to '.gitlab/os-windows.yml')
-rw-r--r--.gitlab/os-windows.yml3
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml
index 1979aa4971..eb063f878d 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