IRSL: Add support for the 2018 release on Windows.

Fixes: #17421
This commit is contained in:
Christian Pfeiffer
2017-11-06 13:04:58 +01:00
committed by Brad King
parent a91eb5e41f
commit f6994f436c
+5 -3
View File
@@ -593,15 +593,17 @@ if(_IRSL_HAVE_Intel)
endif() endif()
endif() endif()
if(WIN32) if(WIN32)
set(__install_dirs "${_Intel_redistdir}/irml" "${_Intel_redistdir}/irml_c" set(__install_dirs "${_Intel_redistdir}/1033")
"${_Intel_redistdir}/1033" "${_Intel_redistdir}/1041") 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 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) libmmd.dll libmmdd.dll libmpx.dll liboffload.dll svml_dispmd.dll)
list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}") list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
endforeach() endforeach()
if(CMAKE_Fortran_COMPILER_ID STREQUAL Intel) 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}") list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
endforeach() endforeach()