Merge branch 'backport-IntelLLVM-no-icpx-on-Windows'

This commit is contained in:
Brad King 2023-01-12 10:24:06 -05:00
commit ea4cfb3b53

View File

@ -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)