Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-16 14:08:35 +08:00
Code Issues Projects Releases Wiki Activity

IRSL: Fix search for Windows redist files with Intel Classic compiler

Browse Source 
The oneAPI icx/ifx compilers are under `.../windows/bin`.
The classic icl/ifort compilers are under `.../windows/bin/intel64`.
Add paths to the redist directory relative to both locations.

Fixes: #22673
This commit is contained in:
Brad King
2021-09-23 11:45:35 -04:00
parent c5b91304ed
commit 956160bb9a
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/InstallRequiredSystemLibraries.cmake
View File

@@ -73,6 +73,8 @@ set(_IRSL_HAVE_MSVC FALSE)
foreach(LANG IN ITEMS C CXX Fortran)
if("${CMAKE_${LANG}_COMPILER_ID}" MATCHES "Intel")
if(NOT _IRSL_HAVE_Intel)
# The oneAPI icx/ifx compilers are under ${os}/bin.
# The classic icc/icpc/icl/ifort compilers may be under ${os}/bin/intel64.
get_filename_component(_Intel_basedir "${CMAKE_${LANG}_COMPILER}" PATH)
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(_Intel_archdir intel64)
@@ -83,6 +85,8 @@ foreach(LANG IN ITEMS C CXX Fortran)
if(WIN32)
set(_Intel_possible_redistdirs
"${_Intel_basedir}/../redist/${_Intel_archdir}_win/compiler"
"${_Intel_basedir}/../redist/${_Intel_archdir}/compiler"
"${_Intel_basedir}/../../redist/${_Intel_archdir}_win/compiler"
"${_Intel_basedir}/../../redist/${_Intel_archdir}/compiler"
)
elseif(APPLE)