diff options
| author | Brad King <brad.king@kitware.com> | 2021-06-09 11:56:22 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-06-09 11:56:28 (GMT) |
| commit | 12fc4f1239aeff91aa7563496c13c87c17d81373 (patch) | |
| tree | 8d67bdf9b57beb4e3e1c7ce6f1a47b013c40fe84 | |
| parent | f092fe677f7061a18ca406927ce314a8b2561f90 (diff) | |
| parent | 6d4c51c29edfa663fce8f858e4ef0a5abf4f2e85 (diff) | |
| download | CMake-12fc4f1239aeff91aa7563496c13c87c17d81373.zip CMake-12fc4f1239aeff91aa7563496c13c87c17d81373.tar.gz CMake-12fc4f1239aeff91aa7563496c13c87c17d81373.tar.bz2 | |
Merge topic 'irsl-intel-oneapi-windows' into release-3.20
6d4c51c29e IRSL: Add Intel oneAPI redist location on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6199
| -rw-r--r-- | Modules/InstallRequiredSystemLibraries.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake index 2d08e08..fa7b125 100644 --- a/Modules/InstallRequiredSystemLibraries.cmake +++ b/Modules/InstallRequiredSystemLibraries.cmake @@ -80,7 +80,9 @@ foreach(LANG IN ITEMS C CXX Fortran) set(_Intel_archdir ia32) endif() set(_Intel_compiler_ver ${CMAKE_${LANG}_COMPILER_VERSION}) - if(WIN32) + if(WIN32 AND EXISTS "${_Intel_basedir}/../redist/${_Intel_archdir}_win/compiler") + get_filename_component(_Intel_redistdir "${_Intel_basedir}/../redist/${_Intel_archdir}_win/compiler" ABSOLUTE) + elseif(WIN32) get_filename_component(_Intel_redistdir "${_Intel_basedir}/../../redist/${_Intel_archdir}/compiler" ABSOLUTE) elseif(APPLE) get_filename_component(_Intel_redistdir "${_Intel_basedir}/../../compiler/lib" ABSOLUTE) |