Merge topic 'IntelLLVM-Fortran-no-isystem' into release-3.29

a80d8e839d IntelLLVM: Revert accidental use of -external:I with Fortran compilers

Acked-by: Kitware Robot <[email protected]>
Reviewed-by: Ben Boeckel <[email protected]>
Merge-request: !9368

Modules/Compiler/IntelLLVM.cmake

@@ -32,16 +32,16 @@ if(CMAKE_HOST_WIN32)
     else()
       set(CMAKE_${lang}_COMPILE_OPTIONS_INVALID_PCH -Winvalid-pch)
       set(CMAKE_${lang}_COMPILE_OPTIONS_WARNING_AS_ERROR "-WX")
+      if(CMAKE_${lang}_COMPILER_VERSION VERSION_GREATER_EQUAL "2021.4")
+        set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-external:I")
+        if(CMAKE_${lang}_COMPILER_VERSION VERSION_GREATER_EQUAL "2022.2")
+          set(_CMAKE_INCLUDE_SYSTEM_FLAG_${lang}_WARNING "-external:W0 ")
+        endif()
+      endif()
     endif()
     __compiler_intel_llvm_common(${lang})
     set(CMAKE_${lang}_COMPILE_OPTIONS_IPO "-Qipo")
     set(CMAKE_${lang}_LINK_OPTIONS_IPO "-Qipo")
-    if (CMAKE_${lang}_COMPILER_VERSION VERSION_GREATER_EQUAL "2021.4")
-      set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-external:I")
-      if (CMAKE_${lang}_COMPILER_VERSION VERSION_GREATER_EQUAL "2022.2")
-        set(_CMAKE_INCLUDE_SYSTEM_FLAG_${lang}_WARNING "-external:W0 ")
-      endif ()
-    endif ()
   endmacro()
 else()
   # GNU-like