Merge topic 'irsl-fortran-only-linux'

05ece372a6 IRSL: Fix Intel library list for ifort-only setups

Acked-by: Kitware Robot <[email protected]>
Merge-request: !2061

Modules/InstallRequiredSystemLibraries.cmake

@@ -584,8 +584,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)
       list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
     endforeach()
-    if(_Intel_compiler_ver VERSION_LESS 17)
-      list(APPEND __install_libs "${_Intel_redistdir}/libistrconv.dylib")
+    if(CMAKE_C_COMPILER_ID STREQUAL Intel OR CMAKE_CXX_COMPILER_ID STREQUAL Intel)
+      if(_Intel_compiler_ver VERSION_LESS 17)
+        list(APPEND __install_libs "${_Intel_redistdir}/libistrconv.dylib")
+      endif()
     endif()
     if(CMAKE_Fortran_COMPILER_ID STREQUAL Intel)
       foreach(__Intel_lib IN ITEMS libifcore.dylib libifcoremt.dylib libifport.dylib libifportmt.dylib)
@@ -594,8 +596,7 @@ if(_IRSL_HAVE_Intel)
       endforeach()
     endif()
   else()
-    set(__install_dirs "${_Intel_redistdir}/irml")
-    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)
+    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)
 
       list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
     endforeach()
@@ -605,10 +606,11 @@ if(_IRSL_HAVE_Intel)
         list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
       endforeach()
     endif()
-    if(_Intel_compiler_ver VERSION_GREATER_EQUAL 15)
-      list(APPEND __install_libs "${_Intel_redistdir}/libistrconv.so")
-      if(CMAKE_C_COMPILER_ID STREQUAL Intel OR CMAKE_CXX_COMPILER_ID STREQUAL Intel)
-        list(APPEND __install_libs "${_Intel_redistdir}/libgfxoffload.so")
+    if(CMAKE_C_COMPILER_ID STREQUAL Intel OR CMAKE_CXX_COMPILER_ID STREQUAL Intel)
+      set(__install_dirs "${_Intel_redistdir}/irml")
+      list(APPEND __install_libs "${_Intel_redistdir}/cilk_db.so")
+      if(_Intel_compiler_ver VERSION_GREATER_EQUAL 15)
+        list(APPEND __install_libs "${_Intel_redistdir}/libistrconv.so" "${_Intel_redistdir}/libgfxoffload.so")
       endif()
     endif()
     if(_Intel_compiler_ver VERSION_GREATER_EQUAL 16)