more rigourously handle compiler checks, especially for MPI

Author: scivision

.appveyor.yml

@@ -1,9 +1,10 @@
 image:
-# - Visual Studio 2017  CMake < 3.13
+- Visual Studio 2017
 - ubuntu1804
 
 environment:
   MINGW_DIR: C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin
+  CMAKE_GENERATOR: "MinGW Makefiles"
 
 clone_depth: 3
 
@@ -14,8 +15,7 @@ init:
 - sh: sudo apt install -yq --no-install-recommends libscalapack-openmpi-dev libopenmpi-dev openmpi-bin
 
 install:
-- cmd: cmake -B build -G "MinGW Makefiles" -DCMAKE_SH="CMAKE_SH-NOTFOUND" ..
-- sh: cmake -B build
+- cmake -B build
 
 - cmake --build build --parallel
 

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.14)
 if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug or Release")
 endif()

coarray/CMakeLists.txt

@@ -10,10 +10,15 @@ if(NOT Coarray_FOUND)
   return()
 endif()
 
-include(CheckFortranSourceCompiles)
+include(CheckFortranSourceRuns)
 set(CMAKE_REQUIRED_FLAGS ${Coarray_COMPILE_OPTIONS})
 set(CMAKE_REQUIRED_LIBRARIES ${Coarray_LIBRARY})
-check_fortran_source_compiles("real :: x[*]; call co_sum(x); end"
+check_fortran_source_runs("real :: x[*]; end"
+  f08coarray SRC_EXT f90)
+if(NOT f08coarray)
+  return()
+endif()
+check_fortran_source_runs("real :: x[*]; call co_sum(x); end"
   f18coarray SRC_EXT f90)
 
 

coarray/meson.build

@@ -3,9 +3,11 @@ if not coarray.found()
   subdir_done()
 endif
 
-f18coarray = fc.run('real :: x[*]; call co_sum(x); end', name: 'F2018 coarray').returncode() == 0
+# this needs to be "run" to verify no dll runtime issues, particularly on Windows.
+f18coarray = fc.run('real :: x[*]; call co_sum(x); end', dependencies: coarray, name: 'F2018 coarray').returncode() == 0
 
-hello = executable('coarray_hello', 'helloworld.f90', dependencies : coarray)
+hello = executable('coarray_hello', 'helloworld.f90',
+  dependencies : coarray)
 test('Coarray Hello', hello)
 
 

contiguous/meson.build

@@ -1,4 +1,4 @@
-if fc.links('contig = is_contiguous(x); end', name: 'F2008 contiguous')
+if fc.links('contig = is_contiguous([1,2,3]); end', name: 'F2008 contiguous')
   f08contig='-DISCONTIG'
 else
   f08contig=''

mpi/meson.build

@@ -4,16 +4,29 @@ if not mpi.found()
   subdir_done()
 endif
 
-if not (fc.run('use mpi; end', name: 'MPI', dependencies : mpi).returncode() == 0)
+if fc.links('''
+    use mpi
+    integer :: i
+    call mpi_init(i)
+    call mpi_finalize(i)
+    end''',
+    dependencies : mpi,
+    name: 'Fortran MPI links')
   subdir_done()
 endif
 
-ver = executable('mpivers', 'mpivers.f90', dependencies : mpi)
+mpiexec = find_program('mpiexec')  # MS-MPI has only mpiexec
+
+ver = executable('mpivers', 'mpivers.f90',
+  dependencies : mpi)
 test('MPI version check', ver)
 
-hello = executable('mpi_hello', 'helloworld.f90', dependencies : mpi)
-test('MPI Hello World', hello)
+hello = executable('mpi_hello', 'helloworld.f90',
+  dependencies : mpi)
+test('MPI Hello World', mpiexec,
+  args: ['-np', '2', hello])
+
 
-mpirun = find_program('mpiexec')  # MS-MPI has only mpiexec
 pass = executable('mpi_pass', 'thread_pass.f90', dependencies : mpi)
-test('MPI thread pass', mpirun, args: ['-np', '2', pass])
+test('MPI thread pass', mpiexec,
+  args: ['-np', '2', pass])

mpi/thread_pass.f90

@@ -22,11 +22,7 @@
 !  Find out the number of processes available.
 call MPI_Comm_size ( MPI_COMM_WORLD, num_procs, ierr)
 if (ierr /= 0) error stop 'mpi size error'
-if (num_procs < 2) then
-  write(stderr,*) 'ERROR: two threads are required, use:'
-  write(stderr,*) 'mpiexec -np 2 ./mpi_pass'
-  stop 1
-endif
+if (num_procs < 2) error stop 'two threads are required, use: mpiexec -np 2 ./mpi_pass'
 
 !  Have Process 0 say hello.
 if ( rank == 0 ) then