Intel LLVM: use new wrappers

Author: perazz

src/metapackage/fpm_meta_mpi.f90

@@ -761,8 +761,8 @@ subroutine mpi_wrappers(compiler,fort_wrappers,c_wrappers,cpp_wrappers)
                          string_t(get_env('MPIf77','mpif77'))]
 
         if (get_os_type()==OS_WINDOWS) then
-            c_wrappers = [c_wrappers,string_t('mpicc.bat')]
-            cpp_wrappers = [cpp_wrappers,string_t('mpicxx.bat')]
+            c_wrappers    = [c_wrappers,string_t('mpicc.bat')]
+            cpp_wrappers  = [cpp_wrappers,string_t('mpicxx.bat')]
             fort_wrappers = [fort_wrappers,string_t('mpifc.bat')]
         endif
 
@@ -775,10 +775,9 @@ subroutine mpi_wrappers(compiler,fort_wrappers,c_wrappers,cpp_wrappers)
              fort_wrappers = [fort_wrappers,string_t('mpigfortran'),string_t('mpgfortran'),&
                               string_t('mpig77'),string_t('mpg77')]
 
-           case (id_intel_classic_windows,id_intel_llvm_windows, &
-                 id_intel_classic_nix,id_intel_classic_mac,id_intel_llvm_nix,id_intel_llvm_unknown)
-
-                c_wrappers = [string_t(get_env('I_MPI_CC','mpiicc'))]
+           case (id_intel_classic_windows,id_intel_classic_nix,id_intel_classic_mac)
+                 
+                c_wrappers = [string_t(get_env('I_MPI_CC' ,'mpiicc'))]
               cpp_wrappers = [string_t(get_env('I_MPI_CXX','mpiicpc'))]
              fort_wrappers = [string_t(get_env('I_MPI_F90','mpiifort'))]
 
@@ -802,6 +801,32 @@ subroutine mpi_wrappers(compiler,fort_wrappers,c_wrappers,cpp_wrappers)
 
              end if
 
+           case (id_intel_llvm_windows,id_intel_llvm_nix,id_intel_llvm_unknown)
+                 
+                c_wrappers = [string_t(get_env('I_MPI_CC' ,'mpiicx'))]
+              cpp_wrappers = [string_t(get_env('I_MPI_CXX','mpiicpx'))]
+             fort_wrappers = [string_t(get_env('I_MPI_F90','mpiifx'))]
+
+             ! Also search MPI wrappers via the base MPI folder
+             mpi_root = get_env('I_MPI_ROOT')
+             if (mpi_root/="") then
+
+                 mpi_root = join_path(mpi_root,'bin')
+
+                 intel_wrap = join_path(mpi_root,'mpiifx')
+                 if (get_os_type()==OS_WINDOWS) intel_wrap = get_dos_path(intel_wrap,error)
+                 if (intel_wrap/="") fort_wrappers = [fort_wrappers,string_t(intel_wrap)]
+
+                 intel_wrap = join_path(mpi_root,'mpiicx')
+                 if (get_os_type()==OS_WINDOWS) intel_wrap = get_dos_path(intel_wrap,error)
+                 if (intel_wrap/="") c_wrappers = [c_wrappers,string_t(intel_wrap)]
+
+                 intel_wrap = join_path(mpi_root,'mpiicpx')
+                 if (get_os_type()==OS_WINDOWS) intel_wrap = get_dos_path(intel_wrap,error)
+                 if (intel_wrap/="") cpp_wrappers = [cpp_wrappers,string_t(intel_wrap)]
+
+             end if
+
            case (id_pgi,id_nvhpc)
 
                 c_wrappers = [c_wrappers,string_t('mpipgicc'),string_t('mpgcc')]