summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-11-06 19:11:39 (GMT)
committerBrad King <brad.king@kitware.com>2017-11-06 19:11:39 (GMT)
commit6f80b10c8371f7dd19db19bde393981e016a9319 (patch)
tree4cbbb38a48be001e3069f0b9981776a4abf8c54e
parent45da558742bad36be518e8d95dee0d0ec3793a64 (diff)
parentf6994f436c1b8922fbe87fbd6f74fd5f1e09ac73 (diff)
downloadCMake-6f80b10c8371f7dd19db19bde393981e016a9319.zip
CMake-6f80b10c8371f7dd19db19bde393981e016a9319.tar.gz
CMake-6f80b10c8371f7dd19db19bde393981e016a9319.tar.bz2
Merge branch 'irsl-win2018' into release-3.10
Merge-request: !1451
-rw-r--r--Modules/InstallRequiredSystemLibraries.cmake8
1 files changed, 5 insertions, 3 deletions
diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake
index ac8c20b..1ba4877 100644
--- a/Modules/InstallRequiredSystemLibraries.cmake
+++ b/Modules/InstallRequiredSystemLibraries.cmake
@@ -593,15 +593,17 @@ if(_IRSL_HAVE_Intel)
endif()
endif()
if(WIN32)
- set(__install_dirs "${_Intel_redistdir}/irml" "${_Intel_redistdir}/irml_c"
- "${_Intel_redistdir}/1033" "${_Intel_redistdir}/1041")
+ set(__install_dirs "${_Intel_redistdir}/1033")
+ if(_Intel_compiler_ver VERSION_LESS 18)
+ list(APPEND __install_dirs "${_Intel_redistdir}/irml" "${_Intel_redistdir}/irml_c" "${_Intel_redistdir}/1041")
+ 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)
list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
endforeach()
if(CMAKE_Fortran_COMPILER_ID STREQUAL Intel)
- foreach(__Intel_lib IN ITEMS libicaf.dll libifcoremd.dll libifcoremdd.dll libifcorert.dll libifcorertd.dll libifportmd.dll)
+ foreach(__Intel_lib IN ITEMS ifdlg100.dll libicaf.dll libifcoremd.dll libifcoremdd.dll libifcorert.dll libifcorertd.dll libifportmd.dll)
list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
endforeach()