Browse Source

Merge topic 'irsl-intel-oneapi-windows'

6d4c51c29e IRSL: Add Intel oneAPI redist location on Windows

Acked-by: Kitware Robot <[email protected]>
Merge-request: !6199
Brad King 4 years ago
parent
commit
3394dcb64f
1 changed files with 3 additions and 1 deletions
  1. 3 1
      Modules/InstallRequiredSystemLibraries.cmake

+ 3 - 1
Modules/InstallRequiredSystemLibraries.cmake

@@ -80,7 +80,9 @@ foreach(LANG IN ITEMS C CXX Fortran)
         set(_Intel_archdir ia32)
         set(_Intel_archdir ia32)
       endif()
       endif()
       set(_Intel_compiler_ver ${CMAKE_${LANG}_COMPILER_VERSION})
       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)
         get_filename_component(_Intel_redistdir "${_Intel_basedir}/../../redist/${_Intel_archdir}/compiler" ABSOLUTE)
       elseif(APPLE)
       elseif(APPLE)
         get_filename_component(_Intel_redistdir "${_Intel_basedir}/../../compiler/lib" ABSOLUTE)
         get_filename_component(_Intel_redistdir "${_Intel_basedir}/../../compiler/lib" ABSOLUTE)