Merge branch 'master' into fix-windows-installer

Author: zbeekman

.travis.yml

@@ -15,8 +15,8 @@ env:
     - MPICH_BOT_URL_TAIL="mpich-3.2_3.yosemite.bottle.1.tar.gz"
     - BUILD_TYPES="Release Debug RelWithDebInfo CodeCoverage"
   matrix:
-    - GCC=6 OSX_PACKAGES="gcc@6 cmake"
-    - GCC=7 OSX_PACKAGES="gcc cmake"
+    - GCC=6 OSX_PACKAGES="gcc@6 cmake shellcheck"
+    - GCC=7 OSX_PACKAGES="gcc cmake shellcheck"
 
 matrix:
   fast_finish: true
@@ -34,6 +34,7 @@ matrix:
     - &ubuntu
       os: linux
       sudo: false
+      dist: trusty
       env:
         - GCC=6
       cache:
@@ -52,22 +53,24 @@ matrix:
             - binutils
             - cmake-data
             - cmake
-    # -
-    #   <<: *ubuntu
-    #   env:
-    #     - GCC=7
-    #   addons:
-    #     apt:
-    #       sources:
-    #         - ubuntu-toolchain-r-test
-    #         - george-edison55-precise-backports
-    #       packages:
-    #         - gcc-7
-    #         - gfortran-7
-    #         - g++-7
-    #         - binutils
-    #         - cmake-data
-    #         - cmake
+#            - shellcheck
+    -
+      <<: *ubuntu
+      env:
+        - GCC=7
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - george-edison55-precise-backports
+          packages:
+            - gcc-7
+            - gfortran-7
+            - g++-7
+            - binutils
+            - cmake-data
+            - cmake
+#            - shellcheck
     -
       <<: *ubuntu
       env:
@@ -82,6 +85,7 @@ matrix:
             - gcc-6
             - gfortran-6
             - g++-6
+#            - shellcheck
   allow_failures:
     - os: osx
       env:

Brewfile

@@ -13,8 +13,8 @@
 
 brew 'cmake'
 brew 'gcc'
-brew 'mpich', args: ['cc=gcc-6', 'cxx=g++-6']
-brew 'opencoarrays'
+brew 'mpich', args: ['cc=gcc-7', 'build-from-source']
+brew 'opencoarrays', args: ['cc=gcc-7', 'build-from-source']
 
 # [Homebrew]: http://brew.sh
 # [Linuxbrew]: http://linuxbrew.sh

CMakeLists.txt

@@ -9,7 +9,7 @@ report_results()
   compiler_install_root="${fully_qualified_FC%bin/gfortran*}"
 
   fully_qualified_MPIFC="$(type -P "${MPIFC}")"
-  mpi_install_root="${fully_qualified_MPIFC%bin/mpif90*}"
+  mpi_install_root="${fully_qualified_MPIFC%bin/mpifort*}"
 
   fully_qualified_CMAKE="$(type -P "${CMAKE}")"
   cmake_install_path="${fully_qualified_CMAKE%/cmake*}"
@@ -71,7 +71,7 @@ report_results()
       echo "set LD_LIBRARY_PATH = (\"${compiler_lib_paths%/}\"/bin \"\$LD_LIBRARY_PATH\") " >> setup.csh
     fi
     echo "                                                                       " >> setup.sh
-    if [[ -x "${mpi_install_root}/bin/mpif90" ]]; then
+    if [[ -x "${mpi_install_root}/bin/mpifort" ]]; then
       echo "# Prepend the MPI path to the PATH environment variable:" | tee -a setup.sh setup.csh
       echo "if [[ -z \"\${PATH}\" ]]; then                                         " >> setup.sh
       echo "  export PATH=\"${mpi_install_root%/}/bin\"                        " >> setup.sh