diff options
| author | Brad King <brad.king@kitware.com> | 2021-10-22 11:07:34 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-10-22 11:07:48 (GMT) |
| commit | b3802804f1a7fa5c994fdefe34f2e94138759d8d (patch) | |
| tree | 43cf743f6aed4b020d11057578531e5df1e25f0b | |
| parent | 26c61c62440f02b3923cd075de7fe20c766b0e80 (diff) | |
| parent | b7863da78fec29d193819b77970f53b62730a4a5 (diff) | |
| download | CMake-b3802804f1a7fa5c994fdefe34f2e94138759d8d.zip CMake-b3802804f1a7fa5c994fdefe34f2e94138759d8d.tar.gz CMake-b3802804f1a7fa5c994fdefe34f2e94138759d8d.tar.bz2 | |
Merge topic 'ci-openwatcom'
b7863da78f ci: Avoid OpenWatcom linker temp file collisions
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6650
| -rw-r--r-- | .gitlab/os-windows.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 15d883d..298b719 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -181,6 +181,7 @@ - Set-Item -Force -Path "env:INCLUDE" -Value "$pwdpath\.gitlab\watcom\h;$pwdpath\.gitlab\watcom\h\nt" - Set-Item -Force -Path "env:EDPATH" -Value "$pwdpath\.gitlab\watcom\eddat" - Set-Item -Force -Path "env:WATCOM" -Value "$pwdpath\.gitlab\watcom" + - Set-Item -Force -Path "env:WLINKTMP" -Value "." - build/install/bin/ctest --output-on-failure -V -S .gitlab/ci/ctest_test_external.cmake interruptible: true |