diff options
| author | Brad King <brad.king@kitware.com> | 2023-01-12 15:33:50 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-01-12 15:33:50 (GMT) |
| commit | 76ab7cb79fa6519651ab110ec4037d62dad21bab (patch) | |
| tree | dd53792802705276d81e13ec8c3dfba00fa68a18 | |
| parent | 05dffe6e840e6e2c839fba8678888f00329760ae (diff) | |
| parent | 8834e4d6a51b4c05ea51099f3865bafe7839f845 (diff) | |
| download | CMake-76ab7cb79fa6519651ab110ec4037d62dad21bab.zip CMake-76ab7cb79fa6519651ab110ec4037d62dad21bab.tar.gz CMake-76ab7cb79fa6519651ab110ec4037d62dad21bab.tar.bz2 | |
Merge branch 'backport-IntelLLVM-no-icpx-on-Windows' into release-3.24
Merge-request: !8041
| -rw-r--r-- | Modules/CMakeDetermineCXXCompiler.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
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) |