diff options
| author | Brad King <brad.king@kitware.com> | 2023-01-12 15:24:06 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-01-12 15:24:06 (GMT) |
| commit | ea4cfb3b5351336c38e656a68e9c4a4aa13ecfeb (patch) | |
| tree | b69f2cfa5e34a5abe0c100773c5d69131d999d95 | |
| parent | 6b92224f6c8758e5e84b1425273f4abf3b278f54 (diff) | |
| parent | 8834e4d6a51b4c05ea51099f3865bafe7839f845 (diff) | |
| download | CMake-ea4cfb3b5351336c38e656a68e9c4a4aa13ecfeb.zip CMake-ea4cfb3b5351336c38e656a68e9c4a4aa13ecfeb.tar.gz CMake-ea4cfb3b5351336c38e656a68e9c4a4aa13ecfeb.tar.bz2 | |
Merge branch 'backport-IntelLLVM-no-icpx-on-Windows'
| -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) |