Merge pull request #95 from JuliaParallel/eschnett/fix-darwin-openmpi-4

Correct Travis build for Darwin OpenMPI

Author: eschnett

conf/travis-install-mpi.sh

@@ -11,13 +11,16 @@ os=`uname`
 case "$os" in
     Darwin)
         brew update
-	brew upgrade gcc
+        brew upgrade cmake
+	    brew upgrade gcc
         case "$MPI_IMPL" in
             mpich|mpich3)
                 brew install mpich
-                ;; 
+                ;;
             openmpi)
-                brew install openmpi
+                # Temporarily build OpenMPI from source, since apparently our
+                # cmake doesn't know how to handle OpenMPI 1.10 yet
+                brew install openmpi --build-from-source
                 ;;
             *)
                 echo "Unknown MPI implementation: $MPI_IMPL"