summaryrefslogtreecommitdiffstats
path: root/.gitlab
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-11-12 18:17:05 (GMT)
committerBrad King <brad.king@kitware.com>2021-11-15 15:24:32 (GMT)
commit658009b6fe279f91343a4c2797bbde1f8a3962fb (patch)
tree91049ad279c3d552f5000272eab3c5e339bdf538 /.gitlab
parent7418866d4d8e9fcc5a7a952f88551bdcd19a4924 (diff)
downloadCMake-658009b6fe279f91343a4c2797bbde1f8a3962fb.zip
CMake-658009b6fe279f91343a4c2797bbde1f8a3962fb.tar.gz
CMake-658009b6fe279f91343a4c2797bbde1f8a3962fb.tar.bz2
ci: Fix vcvarsall.ps1 environment variable lookup
Previously we were relying on `VCVARSPLATFORM` and `VCVARSVERSION` powershell script variables. Read them from the environment directly.
Diffstat (limited to '.gitlab')
-rwxr-xr-x.gitlab/ci/vcvarsall.ps12
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab/ci/vcvarsall.ps1 b/.gitlab/ci/vcvarsall.ps1
index 57d3386..f91b100 100755
--- a/.gitlab/ci/vcvarsall.ps1
+++ b/.gitlab/ci/vcvarsall.ps1
@@ -1,6 +1,6 @@
$erroractionpreference = "stop"
-cmd /c "`"$env:VCVARSALL`" $VCVARSPLATFORM -vcvars_ver=$VCVARSVERSION & set" |
+cmd /c "`"$env:VCVARSALL`" $env:VCVARSPLATFORM -vcvars_ver=$env:VCVARSVERSION & set" |
foreach {
if ($_ -match "=") {
$v = $_.split("=")