diff options
| author | Brad King <brad.king@kitware.com> | 2024-11-01 13:09:36 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-11-01 13:09:51 (GMT) |
| commit | 4002b6c60accdff69c90f6263716d219ef4f3cf9 (patch) | |
| tree | 7682e33ec83782a72dc87b81273359d997808f3a /.gitlab | |
| parent | 9e16cd5efb14aad236129ed0af1982fb832f4ebb (diff) | |
| parent | c1ddff67f2f4fb7ec08c1481135b442a03762e5e (diff) | |
| download | CMake-4002b6c60accdff69c90f6263716d219ef4f3cf9.zip CMake-4002b6c60accdff69c90f6263716d219ef4f3cf9.tar.gz CMake-4002b6c60accdff69c90f6263716d219ef4f3cf9.tar.bz2 | |
Merge topic 'ci-vcvarsall-fix' into release-3.31
c1ddff67f2 ci: use JSON to transfer environment variables
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9963
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/vcvarsall.ps1 | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/.gitlab/ci/vcvarsall.ps1 b/.gitlab/ci/vcvarsall.ps1 index f91b100..f8c4150 100644 --- a/.gitlab/ci/vcvarsall.ps1 +++ b/.gitlab/ci/vcvarsall.ps1 @@ -1,9 +1,7 @@ $erroractionpreference = "stop" -cmd /c "`"$env:VCVARSALL`" $env:VCVARSPLATFORM -vcvars_ver=$env:VCVARSVERSION & set" | -foreach { - if ($_ -match "=") { - $v = $_.split("=") - [Environment]::SetEnvironmentVariable($v[0], $v[1]) - } +$all_env = cmd /c "`"$env:VCVARSALL`" $env:VCVARSPLATFORM -vcvars_ver=$env:VCVARSVERSION >NUL & powershell -Command `"Get-ChildItem env: | Select-Object -Property Key,Value | ConvertTo-Json`"" | ConvertFrom-Json + +foreach ($envvar in $all_env) { + [Environment]::SetEnvironmentVariable($envvar.Key, $envvar.Value) } |