mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 13:20:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

IRSL: Fix Intel library list for ifort-only setups

Browse Source 
Fixes: #17727
This commit is contained in:
Christian Pfeiffer
2018-05-10 19:57:50 +02:00
committed by Brad King
parent fbe6cd1596
commit 05ece372a6
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Modules/InstallRequiredSystemLibraries.cmake
View File

@@ -621,8 +621,10 @@ if(_IRSL_HAVE_Intel)
foreach(__Intel_lib IN ITEMS libchkp.dylib libcilkrts.5.dylib libcilkrts.dylib libimf.dylib libintlc.dylib libirc.dylib libirng.dylib libsvml.dylib) foreach(__Intel_lib IN ITEMS libchkp.dylib libcilkrts.5.dylib libcilkrts.dylib libimf.dylib libintlc.dylib libirc.dylib libirng.dylib libsvml.dylib)
list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}") list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
endforeach() endforeach()
if(_Intel_compiler_ver VERSION_LESS 17) if(CMAKE_C_COMPILER_ID STREQUAL Intel OR CMAKE_CXX_COMPILER_ID STREQUAL Intel)
list(APPEND __install_libs "${_Intel_redistdir}/libistrconv.dylib") if(_Intel_compiler_ver VERSION_LESS 17)
list(APPEND __install_libs "${_Intel_redistdir}/libistrconv.dylib")
endif()
endif() endif()
if(CMAKE_Fortran_COMPILER_ID STREQUAL Intel) if(CMAKE_Fortran_COMPILER_ID STREQUAL Intel)
foreach(__Intel_lib IN ITEMS libifcore.dylib libifcoremt.dylib libifport.dylib libifportmt.dylib) foreach(__Intel_lib IN ITEMS libifcore.dylib libifcoremt.dylib libifport.dylib libifportmt.dylib)
@@ -631,8 +633,7 @@ if(_IRSL_HAVE_Intel)
endforeach() endforeach()
endif() endif()
else() else()
set(__install_dirs "${_Intel_redistdir}/irml") foreach(__Intel_lib IN ITEMS libchkp.so libcilkrts.so libcilkrts.so.5 libimf.so libintlc.so libintlc.so.5 libirc.so libpdbx.so libpdbx.so.5 libsvml.so)
foreach(__Intel_lib IN ITEMS cilk_db.so libchkp.so libcilkrts.so libcilkrts.so.5 libimf.so libintlc.so libintlc.so.5 libirc.so libpdbx.so libpdbx.so.5 libsvml.so)
list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}") list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
endforeach() endforeach()
@@ -642,10 +643,11 @@ if(_IRSL_HAVE_Intel)
list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}") list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
endforeach() endforeach()
endif() endif()
if(_Intel_compiler_ver VERSION_GREATER_EQUAL 15) if(CMAKE_C_COMPILER_ID STREQUAL Intel OR CMAKE_CXX_COMPILER_ID STREQUAL Intel)
list(APPEND __install_libs "${_Intel_redistdir}/libistrconv.so") set(__install_dirs "${_Intel_redistdir}/irml")
if(CMAKE_C_COMPILER_ID STREQUAL Intel OR CMAKE_CXX_COMPILER_ID STREQUAL Intel) list(APPEND __install_libs "${_Intel_redistdir}/cilk_db.so")
list(APPEND __install_libs "${_Intel_redistdir}/libgfxoffload.so") if(_Intel_compiler_ver VERSION_GREATER_EQUAL 15)
list(APPEND __install_libs "${_Intel_redistdir}/libistrconv.so" "${_Intel_redistdir}/libgfxoffload.so")
endif() endif()
endif() endif()
if(_Intel_compiler_ver VERSION_GREATER_EQUAL 16) if(_Intel_compiler_ver VERSION_GREATER_EQUAL 16)