diff options
| author | Brad King <brad.king@kitware.com> | 2021-12-17 13:51:44 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-12-17 08:52:02 -0500 |
| commit | 5cd7a6ac1ed7e0c4a5e3b4c145bc692281b1a6fe (patch) | |
| tree | 51f4dbff003fb89fefca8a3c5f4518969256ea3f /Modules/CMakeDetermineCompilerId.cmake | |
| parent | a1da2c38dd3172ed08260dc1d36c48f1458c4923 (diff) | |
| parent | 612c0d49f4042303b2c666ec8ca6d02deea637a4 (diff) | |
| download | cmake-5cd7a6ac1ed7e0c4a5e3b4c145bc692281b1a6fe.tar.gz | |
Merge topic 'vs-intel-oneapi-toolset' into release-3.22
612c0d49f4 VS: Fix detecting icx.exe with Intel Compiler toolsets newer than 2021
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6806
Diffstat (limited to 'Modules/CMakeDetermineCompilerId.cmake')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index c62cb7d249..916f60c819 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -320,15 +320,13 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS} set(id_cl "$(CLToolExe)") elseif(CMAKE_VS_PLATFORM_TOOLSET MATCHES "v[0-9]+_clang_.*") set(id_cl clang.exe) - # Executable names have been chosen according documentation - # URL: (https://software.intel.com/content/www/us/en/develop/documentation/get-started-with-dpcpp-compiler/top.html#top_GUID-A9B4C91D-97AC-450D-9742-9D895BC8AEE1) elseif(CMAKE_VS_PLATFORM_TOOLSET MATCHES "Intel") if(CMAKE_VS_PLATFORM_TOOLSET MATCHES "DPC\\+\\+ Compiler") set(id_cl dpcpp.exe) - elseif(CMAKE_VS_PLATFORM_TOOLSET MATCHES "C\\+\\+ Compiler 2021") - set(id_cl icx.exe) - elseif(CMAKE_VS_PLATFORM_TOOLSET MATCHES "C\\+\\+ Compiler") + elseif(CMAKE_VS_PLATFORM_TOOLSET MATCHES "C\\+\\+ Compiler ([8-9]\\.|1[0-9]\\.|XE)") set(id_cl icl.exe) + elseif(CMAKE_VS_PLATFORM_TOOLSET MATCHES "C\\+\\+ Compiler") + set(id_cl icx.exe) endif() else() set(id_cl cl.exe) |