From 8e7e7af5c8b3ce20a5d6d449b74b861c71f86842 Mon Sep 17 00:00:00 2001 From: Christian Pfeiffer Date: Mon, 20 Nov 2017 16:35:02 +0100 Subject: IRSL: Install the 1041 folder for Intel compilers The presence of the `1041` seems to solely depend on whether a given Intel compiler release was available in Japanese or not. Install it if it is present and silently ignore it otherwise. Example: The Intel 2018.0 release did not ship it, but the 2018.1 compilers have it. --- Modules/InstallRequiredSystemLibraries.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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) -- cgit v0.12