From 781303c0e263b2497829a8f7c2160d223faa8509 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Fri, 11 Nov 2022 11:40:37 -0500
Subject: ci: Factor out helper to load qt into environment on Windows

---
 .gitlab/ci/qt-env.ps1  | 4 ++++
 .gitlab/os-windows.yml | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100755 .gitlab/ci/qt-env.ps1

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
-- 
cgit v0.12