summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorChristian Pfeiffer <cpfeiffer@live.de>2017-11-21 10:56:00 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-11-21 10:56:03 (GMT)
commitdaeadde88871f4e2473ce429f459ae8d6ed0ffb8 (patch)
treeb6335240b320d697faa88b6697e68bd5d3e34ee5 /Modules
parent65c5833858a92dc15978f08fe2acdf852c930ee6 (diff)
parent8e7e7af5c8b3ce20a5d6d449b74b861c71f86842 (diff)
downloadCMake-daeadde88871f4e2473ce429f459ae8d6ed0ffb8.zip
CMake-daeadde88871f4e2473ce429f459ae8d6ed0ffb8.tar.gz
CMake-daeadde88871f4e2473ce429f459ae8d6ed0ffb8.tar.bz2
Merge topic 'irsl-intel-1041-folder'
8e7e7af5 IRSL: Install the 1041 folder for Intel compilers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1509
Diffstat (limited to 'Modules')
-rw-r--r--Modules/InstallRequiredSystemLibraries.cmake5
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake
index 1ba4877..38e0861 100644
--- a/Modules/InstallRequiredSystemLibraries.cmake
+++ b/Modules/InstallRequiredSystemLibraries.cmake
@@ -594,8 +594,11 @@ if(_IRSL_HAVE_Intel)
endif()
if(WIN32)
set(__install_dirs "${_Intel_redistdir}/1033")
+ if(EXISTS "${_Intel_redistdir}/1041")
+ list(APPEND __install_dirs "${_Intel_redistdir}/1041")
+ endif()
if(_Intel_compiler_ver VERSION_LESS 18)
- list(APPEND __install_dirs "${_Intel_redistdir}/irml" "${_Intel_redistdir}/irml_c" "${_Intel_redistdir}/1041")
+ list(APPEND __install_dirs "${_Intel_redistdir}/irml" "${_Intel_redistdir}/irml_c")
endif()
foreach(__Intel_lib IN ITEMS cilkrts20.dll libchkp.dll libgfxoffload.dll libioffload_host.dll libirngmd.dll
libmmd.dll libmmdd.dll libmpx.dll liboffload.dll svml_dispmd.dll)