diff options
| author | Brad King <brad.king@kitware.com> | 2023-01-13 13:39:22 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-01-13 13:39:41 (GMT) |
| commit | 8cf8c24df2dffc818187205fa870e756c7181755 (patch) | |
| tree | 10546738694579108f1c1909d6388e62dad5d415 | |
| parent | c759f4605c8e1641895275ea03886b6c4d207eb7 (diff) | |
| parent | 870d89627f0ab256e9ac6feeed0221ce997a8a51 (diff) | |
| download | CMake-8cf8c24df2dffc818187205fa870e756c7181755.zip CMake-8cf8c24df2dffc818187205fa870e756c7181755.tar.gz CMake-8cf8c24df2dffc818187205fa870e756c7181755.tar.bz2 | |
Merge topic 'IntelLLVM-no-icpx-on-Windows'
870d89627f Help: Clarify compiler id distinction between Intel Classic and IntelLLVM
ea4cfb3b53 Merge branch 'backport-IntelLLVM-no-icpx-on-Windows'
8834e4d6a5 IntelLLVM: Avoid finding not-yet-supported icpx on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8041
| -rw-r--r-- | Help/variable/CMAKE_LANG_COMPILER_ID.rst | 5 | ||||
| -rw-r--r-- | Modules/CMakeDetermineCXXCompiler.cmake | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/Help/variable/CMAKE_LANG_COMPILER_ID.rst b/Help/variable/CMAKE_LANG_COMPILER_ID.rst index e311d1b..3b27fc3 100644 --- a/Help/variable/CMAKE_LANG_COMPILER_ID.rst +++ b/Help/variable/CMAKE_LANG_COMPILER_ID.rst @@ -28,8 +28,8 @@ Value Name ``GHS`` `Green Hills Software`_ ``HP`` Hewlett-Packard Compiler ``IAR`` IAR Systems -``Intel`` Intel Compiler -``IntelLLVM`` Intel LLVM-Based Compiler +``Intel`` Intel Classic Compiler +``IntelLLVM`` `Intel LLVM-Based Compiler`_ ``LCC`` MCST Elbrus C/C++/Fortran Compiler ``MSVC`` `Microsoft Visual Studio`_ ``NVHPC`` `NVIDIA HPC Compiler`_ @@ -58,6 +58,7 @@ languages. .. _G95 Fortran: https://g95.sourceforge.net .. _GNU Compiler Collection: https://gcc.gnu.org .. _Green Hills Software: https://www.ghs.com/products/compiler.html +.. _Intel LLVM-Based Compiler: https://www.intel.com/content/www/us/en/developer/tools/oneapi/overview.html .. _Microsoft Visual Studio: https://visualstudio.microsoft.com .. _NVIDIA HPC Compiler: https://developer.nvidia.com/hpc-compilers .. _NVIDIA CUDA Compiler: https://developer.nvidia.com/cuda-llvm-compiler diff --git a/Modules/CMakeDetermineCXXCompiler.cmake b/Modules/CMakeDetermineCXXCompiler.cmake index fd3d028..c4ddf75 100644 --- a/Modules/CMakeDetermineCXXCompiler.cmake +++ b/Modules/CMakeDetermineCXXCompiler.cmake @@ -58,7 +58,13 @@ else() # finally list compilers to try if(NOT CMAKE_CXX_COMPILER_INIT) - set(CMAKE_CXX_COMPILER_LIST CC ${_CMAKE_TOOLCHAIN_PREFIX}c++ ${_CMAKE_TOOLCHAIN_PREFIX}g++ aCC cl bcc xlC icpx icx clang++) + set(CMAKE_CXX_COMPILER_LIST CC ${_CMAKE_TOOLCHAIN_PREFIX}c++ ${_CMAKE_TOOLCHAIN_PREFIX}g++ aCC cl bcc xlC) + if(NOT CMAKE_HOST_WIN32) + # FIXME(#24314): Add support for the GNU-like icpx compiler driver + # on Windows, first introduced by Intel oneAPI 2023.0. + list(APPEND CMAKE_CXX_COMPILER_LIST icpx) + endif() + list(APPEND CMAKE_CXX_COMPILER_LIST icx clang++) endif() _cmake_find_compiler(CXX) |