diff options
| author | Brad King <brad.king@kitware.com> | 2017-11-08 13:59:28 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-11-08 13:59:52 (GMT) |
| commit | 77b73ff1345977b91915c900a006761fe7c099a6 (patch) | |
| tree | 696045a6acdc46f81212abad0b90a8ac7cd1d704 | |
| parent | 7bd4c1c1bbe94c85e4e361ffcafb3c0ec204d8a6 (diff) | |
| parent | f6994f436c1b8922fbe87fbd6f74fd5f1e09ac73 (diff) | |
| download | CMake-77b73ff1345977b91915c900a006761fe7c099a6.zip CMake-77b73ff1345977b91915c900a006761fe7c099a6.tar.gz CMake-77b73ff1345977b91915c900a006761fe7c099a6.tar.bz2 | |
Merge topic 'irsl-win2018'
f6994f43 IRSL: Add support for the 2018 release on Windows.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1451
| -rw-r--r-- | Modules/InstallRequiredSystemLibraries.cmake | 8 |
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() |