diff options
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/configure_windows_intelclassic_ninja.cmake | 1 | ||||
| -rwxr-xr-x | .gitlab/ci/env_windows_intelclassic_ninja.ps1 | 9 | ||||
| -rwxr-xr-x | .gitlab/ci/intel.ps1 | 2 | ||||
| -rw-r--r-- | .gitlab/os-windows.yml | 8 |
4 files changed, 19 insertions, 1 deletions
diff --git a/.gitlab/ci/configure_windows_intelclassic_ninja.cmake b/.gitlab/ci/configure_windows_intelclassic_ninja.cmake new file mode 100644 index 0000000000..c2d708baf3 --- /dev/null +++ b/.gitlab/ci/configure_windows_intelclassic_ninja.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_intelcompiler_common.cmake") diff --git a/.gitlab/ci/env_windows_intelclassic_ninja.ps1 b/.gitlab/ci/env_windows_intelclassic_ninja.ps1 new file mode 100755 index 0000000000..99f83b9cf1 --- /dev/null +++ b/.gitlab/ci/env_windows_intelclassic_ninja.ps1 @@ -0,0 +1,9 @@ +. .gitlab/ci/ninja-env.ps1 +. .gitlab/ci/intel-env.ps1 + +$env:CC = "icl" +$env:CXX = "icl" +$env:FC = "ifort" + +cmd /c "icl 2>&1" | Select -First 1 +cmd /c "ifort 2>&1" | Select -First 1 diff --git a/.gitlab/ci/intel.ps1 b/.gitlab/ci/intel.ps1 index 50516335a8..2262669d89 100755 --- a/.gitlab/ci/intel.ps1 +++ b/.gitlab/ci/intel.ps1 @@ -1,6 +1,6 @@ $erroractionpreference = "stop" -if ("$env:CMAKE_CI_BUILD_NAME" -match "(^|_)oneapi2023\.1\.0(_|$)") { +if ("$env:CMAKE_CI_BUILD_NAME" -match "(^|_)(oneapi2023\.1\.0|intel2021\.9\.0)(_|$)") { # Intel oneAPI 2023.1.0 $version = "2023.1.0" $filename = "intel-oneapi-$version-windows-1" diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 62542cc246..07a479e045 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -222,6 +222,14 @@ variables: CMAKE_CONFIGURATION: windows_msvc_v71_nmake +.windows_intelclassic_ninja: + extends: + - .windows_ninja + - .windows_vcvarsall_vs2022_x64 + + variables: + CMAKE_CONFIGURATION: windows_intelclassic_ninja + .windows_inteloneapi_ninja: extends: - .windows_ninja |