mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-02 03:39:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

IRSL: Avoid duplication of Intel redist lib folder paths

Browse Source
This commit is contained in:
Alexander Grund
2021-07-30 16:24:53 +02:00
committed by Brad King
parent 2adc45c7f6
commit f4c194398d
1 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Modules/InstallRequiredSystemLibraries.cmake
View File

@@ -80,19 +80,34 @@ foreach(LANG IN ITEMS C CXX Fortran)
set(_Intel_archdir ia32)
endif()
set(_Intel_compiler_ver ${CMAKE_${LANG}_COMPILER_VERSION})
if(WIN32 AND EXISTS "${_Intel_basedir}/../redist/${_Intel_archdir}_win/compiler")
get_filename_component(_Intel_redistdir "${_Intel_basedir}/../redist/${_Intel_archdir}_win/compiler" ABSOLUTE)
elseif(WIN32)
get_filename_component(_Intel_redistdir "${_Intel_basedir}/../../redist/${_Intel_archdir}/compiler" ABSOLUTE)
if(WIN32)
set(_Intel_possible_redistdirs
"${_Intel_basedir}/../redist/${_Intel_archdir}_win/compiler"
"${_Intel_basedir}/../../redist/${_Intel_archdir}/compiler"
)
elseif(APPLE)
get_filename_component(_Intel_redistdir "${_Intel_basedir}/../../compiler/lib" ABSOLUTE)
set(_Intel_possible_redistdirs
"${_Intel_basedir}/../../compiler/lib"
)
else()
if(EXISTS "${_Intel_basedir}/../lib/${_Intel_archdir}")
get_filename_component(_Intel_redistdir "${_Intel_basedir}/../lib/${_Intel_archdir}" ABSOLUTE)
else()
get_filename_component(_Intel_redistdir "${_Intel_basedir}/../../compiler/lib/${_Intel_archdir}_lin" ABSOLUTE)
endif()
set(_Intel_possible_redistdirs
"${_Intel_basedir}/../lib/${_Intel_archdir}"
"${_Intel_basedir}/../../compiler/lib/${_Intel_archdir}_lin"
)
endif()
set(_Intel_redistdir NOT-FOUND)
foreach(dir IN LISTS _Intel_possible_redistdirs)
if(EXISTS "${dir}")
set(_Intel_redistdir "${dir}")
break()
endif()
endforeach()
# Fall back to last dir
if(NOT _Intel_redistdir)
list(POP_BACK _Intel_possible_redistdirs _Intel_redistdir)
endif()
unset(_Intel_possible_redistdirs)
set(_IRSL_HAVE_Intel TRUE)
endif()
elseif("${CMAKE_${LANG}_COMPILER_ID}" STREQUAL "MSVC")