Merge branches 'add-issue-493-tests', 'issue-489-bump-so-version' and 'caf-mpi-arg-fix'

 Just discovering the joys of the "octopus" merge strategy to close multiple
 PRs at the same time without needing to rebase or merge master first.

 All hail !

Author: zbeekman

src/extensions/caf.in

@@ -50,8 +50,8 @@ set -o pipefail
 # List of variables needing configuration:
 #
 # CAF_VERSION, opencoarrays_aware_compiler, Fortran_COMPILER, CAF_MODDIR,
-# MPI_Fortran_LINK_FLAGS, MPI_Fortran_COMPILE_FLAGS,
-# CAF_LIBS, MPI_LIBS
+# CAF_MPI_Fortran_LINK_FLAGS, CAF_MPI_Fortran_COMPILE_FLAGS,
+# CAF_LIBS, CAF_MPI_LIBS
 #
 
 caf_version='@CAF_VERSION@' # fetched from `git describe` and/or
@@ -80,15 +80,15 @@ mod_dir_flag="-I"
 # variables expanded from CMake should be appropriately quoted.
 
 # shellcheck disable=SC2054
-mpi_link_flags=(@MPI_Fortran_LINK_FLAGS@) # e.g. `pkg-config
+mpi_link_flags=(@CAF_MPI_Fortran_LINK_FLAGS@) # e.g. `pkg-config
 # --libs-only-other mpich`
 # __*AND*__ `pkg-config
 # --libs-only-L`
-mpi_compile_flags=(@MPI_Fortran_COMPILE_FLAGS@)
+mpi_compile_flags=(@CAF_MPI_Fortran_COMPILE_FLAGS@)
 caf_libs=(@CAF_LIBS@) # e.g. "libcaf_mpi" "libcaf_extensions",
 # preferably full paths, but could be
 # combination of -L... and -lcaf_mpi...
-mpi_libs=(@MPI_LIBS@) # e.g. `pkg-config --libs-only-l` or full paths
+mpi_libs=(@CAF_MPI_LIBS@) # e.g. `pkg-config --libs-only-l` or full paths
 # to MPI libs
 
 #-------------------------

src/extensions/cafrun.in

@@ -68,10 +68,12 @@ if [[ ${numproc_flag} == @*@ ]]; then
   numproc_flag='-np'
 fi
 preflags="@MPIEXEC_PREFLAGS@"
+preflags="${preflags//;/ }"
 if [[ "${preflags}" == @*@ ]]; then
   unset preflags
 fi
 postflags="@MPIEXEC_POSTFLAGS@"
+postflags="${postflags//;/ }"
 if [[ "${postflags}" == @*@ ]]; then
   unset postflags
 fi

src/mpi/CMakeLists.txt

@@ -158,7 +158,9 @@ target_link_libraries(caf_mpi_static PRIVATE ${MPI_C_LIBRARIES} ${MPI_Fortran_LI
 
 set(CAF_SO_VERSION 0)
 if(gfortran_compiler)
-  if(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0)
+  if(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 8.0.0)
+    set(CAF_SO_VERSION 3)
+  elseif(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0)
     set(CAF_SO_VERSION 2)
   elseif(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 6.0.0)
     set(CAF_SO_VERSION 1)
@@ -208,19 +210,29 @@ install(TARGETS caf_mpi_static EXPORT OpenCoarraysTargets
 # List of caf.in variables needing configuration:
 #
 # @CAF_VERSION@ @opencoarrays_aware_compiler@ @Fortran_COMPILER@ @CAF_MODDIR@
-# @MPI_Fortran_LINK_FLAGS@ @MPI_Fortran_COMPILE_FLAGS@
-# @CAF_LIBS@ @MPI_LIBS@
+# @CAF_MPI_Fortran_LINK_FLAGS@ @CAF_MPI_Fortran_COMPILE_FLAGS@
+# @CAF_LIBS@ @CAF_MPI_LIBS@
 #
 
 set(CAF_VERSION "${full_git_describe}")
 set(Fortran_COMPILER "${CMAKE_Fortran_COMPILER}")
 set(CAF_MODDIR "${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}")
 set(MOD_DIR_FLAG "${CMAKE_Fortran_MODDIR_FLAG}")
-set(MPI_LIBS "")
+set(CAF_MPI_LIBS "")
 foreach( lib IN LISTS MPI_Fortran_LIBRARIES)
-  set(MPI_LIBS "${MPI_LIBS} \"${lib}\"")
+  set(CAF_MPI_LIBS "${CAF_MPI_LIBS} \"${lib}\"")
 endforeach()
 string(STRIP "${MPI_LIBS}" MPI_LIBS)
+set(CAF_MPI_Fortran_LINK_FLAGS "")
+foreach( lflag IN LISTS MPI_Fortran_LINK_FLAGS)
+  set(CAF_MPI_Fortran_LINK_FLAGS "${CAF_MPI_Fortran_LINK_FLAGS} ${lflag}" )
+endforeach()
+string(STRIP "${CAF_MPI_Fortran_LINK_FLAGS}" CAF_MPI_Fortran_LINK_FLAGS)
+set(CAF_MPI_Fortran_COMPILE_FLAGS "")
+foreach( fcflag IN LISTS MPI_Fortran_COMPILE_FLAGS)
+  set(CAF_MPI_Fortran_COMPILE_FLAGS "${CAF_MPI_Fortran_COMPILE_FLAGS} ${fcflag}" )
+endforeach()
+string(STRIP "${CAF_MPI_Fortran_COMPILE_FLAGS}" CAF_MPI_Fortran_COMPILE_FLAGS)
 set_target_properties(caf_mpi_static
   PROPERTIES OUTPUT_NAME caf_mpi)
 get_target_property(libcaf_static caf_mpi_static OUTPUT_NAME)