diff options
| author | Brad King <brad.king@kitware.com> | 2021-09-23 15:45:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-09-23 15:45:35 (GMT) |
| commit | 956160bb9a50cae8efc0bc256cc4ad3a9330792d (patch) | |
| tree | 980e3df3c2e9662f95276658d1fc001778e5c283 /Modules/InstallRequiredSystemLibraries.cmake | |
| parent | c5b91304edaddd82992140e5b36533509c95b20f (diff) | |
| download | CMake-956160bb9a50cae8efc0bc256cc4ad3a9330792d.zip CMake-956160bb9a50cae8efc0bc256cc4ad3a9330792d.tar.gz CMake-956160bb9a50cae8efc0bc256cc4ad3a9330792d.tar.bz2 | |
IRSL: Fix search for Windows redist files with Intel Classic compiler
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
Diffstat (limited to 'Modules/InstallRequiredSystemLibraries.cmake')
| -rw-r--r-- | Modules/InstallRequiredSystemLibraries.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake index 4d3bfe2..4399a71 100644 --- a/Modules/InstallRequiredSystemLibraries.cmake +++ b/Modules/InstallRequiredSystemLibraries.cmake @@ -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) |