FindMPI: Cannot find MSMPI for Fortran

The CMake 3.18 findMPI on Windows 10 can’t find MS-MPI for Fortran. After some investigations, I found that this patch fixed the problem:

FindMPI.cmake	Thu Aug 20 08:20:32 2020
FindMPI.cmake-p1	Wed Sep 30 11:10:26 2020
***************
*** 1091,1096 ****
--- 1091,1101 ----
    if(MPI_${LANG}_INCLUDE_DIRS)
      list(REMOVE_DUPLICATES MPI_${LANG}_INCLUDE_DIRS)
    endif()
+     if(MPI_${LANG}_ADDITIONAL_INCLUDE_VARS)
+       foreach(MPI_ADDITIONAL_INC_DIR IN LISTS MPI_${LANG}_ADDITIONAL_INCLUDE_VARS)
+         list(APPEND MPI_${LANG}_INCLUDE_DIRS "${MPI_${MPI_ADDITIONAL_INC_DIR}_INCLUDE_DIR}")
+       endforeach()
+     endif()
  endmacro()
  macro(_MPI_split_include_dirs LANG)

Regards,

Tetsuya Mishima