diff options
| author | Brad King <brad.king@kitware.com> | 2024-05-30 13:50:52 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-05-30 18:20:03 (GMT) |
| commit | fd8c782ded5fac81166ea619b060416d8a756527 (patch) | |
| tree | cd8ad7294da4a29bd7b5dfba5e8dcae6968d2fde /.gitlab/ci | |
| parent | f28d88a3515ef4abc146583f26ed4681ede871e6 (diff) | |
| download | CMake-fd8c782ded5fac81166ea619b060416d8a756527.zip CMake-fd8c782ded5fac81166ea619b060416d8a756527.tar.gz CMake-fd8c782ded5fac81166ea619b060416d8a756527.tar.bz2 | |
ci: Update to IntelLLVM 2024.1.0 on Windows
Diffstat (limited to '.gitlab/ci')
| -rw-r--r-- | .gitlab/ci/intel.ps1 | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/.gitlab/ci/intel.ps1 b/.gitlab/ci/intel.ps1 index 2262669..171e6a7 100644 --- a/.gitlab/ci/intel.ps1 +++ b/.gitlab/ci/intel.ps1 @@ -1,8 +1,19 @@ $erroractionpreference = "stop" -if ("$env:CMAKE_CI_BUILD_NAME" -match "(^|_)(oneapi2023\.1\.0|intel2021\.9\.0)(_|$)") { +if ("$env:CMAKE_CI_BUILD_NAME" -match "(^|_)(oneapi2024\.1\.0)(_|$)") { + # Intel oneAPI 2024.1.0 + $version = "2024.1.0" + $version_dir = "2024.1" + $bin_dir = "bin" + $llvm_dir = "bin\compiler" + $filename = "intel-oneapi-$version-windows-1" + $sha256sum = "CB6857C08CD815722913358EC495AA575C2EED730646098A6CF7178E55FA7323" +} elseif ("$env:CMAKE_CI_BUILD_NAME" -match "(^|_)(intel2021\.9\.0)(_|$)") { # Intel oneAPI 2023.1.0 $version = "2023.1.0" + $version_dir = "2023.1.0" + $bin_dir = "windows\bin" + $llvm_dir = "windows\bin-llvm" $filename = "intel-oneapi-$version-windows-1" $sha256sum = "5AFCA9E0B03894565209B1295476163ABEBB1F1388E0F3EF5B4D0F9189E65BDC" } else { @@ -26,12 +37,12 @@ Move-Item -Path "$outdir\$filename" -Destination "$outdir\intel" Remove-Item "$outdir\$tarball" $compiler = "$outdir\intel\compiler" -$bin = "$compiler\$version\windows\bin" -$null = New-Item -ItemType Junction -Path "$compiler\latest" -Target "$compiler\$version" +$bin = "$compiler\$version_dir\$bin_dir" +$null = New-Item -ItemType Junction -Path "$compiler\latest" -Target "$compiler\$version_dir" $null = New-Item -ItemType HardLink -Path "$bin\icx-cl.exe" -Target "$bin\icx.exe" $null = New-Item -ItemType HardLink -Path "$bin\icx-cc.exe" -Target "$bin\icx.exe" $null = New-Item -ItemType HardLink -Path "$bin\icpx.exe" -Target "$bin\icx.exe" -$bin = "$compiler\$version\windows\bin-llvm" +$bin = "$compiler\$version_dir\$llvm_dir" $null = New-Item -ItemType HardLink -Path "$bin\clang-cl.exe" -Target "$bin\clang.exe" $null = New-Item -ItemType HardLink -Path "$bin\clang-cpp.exe" -Target "$bin\clang.exe" $null = New-Item -ItemType HardLink -Path "$bin\clang++.exe" -Target "$bin\clang.exe" @@ -40,3 +51,8 @@ $null = New-Item -ItemType HardLink -Path "$bin\ld.lld.exe" -Target "$bin\lld $null = New-Item -ItemType HardLink -Path "$bin\llvm-lib.exe" -Target "$bin\llvm-ar.exe" Clear-Variable -Name bin Clear-Variable -Name compiler + +Clear-Variable -Name llvm_dir +Clear-Variable -Name bin_dir +Clear-Variable -Name version_dir +Clear-Variable -Name version |