diff options
| author | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2007-05-23 14:40:40 +0000 |
|---|---|---|
| committer | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2007-05-23 14:40:40 +0000 |
| commit | a8850d6aa31dbdffbdc43b24d05627c17702453b (patch) | |
| tree | 7febd6238867a8b49c6ce9c64b4ae4fe8e408b2d /lib/make/extras | |
| parent | d7d16dc1fb7e65a7eefbb4bcbae6fdf3aef5755d (diff) | |
fix MPI_INCLUDES and MPI_LIBS when using OpenMPI v1.1
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4421 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make/extras')
| -rw-r--r-- | lib/make/extras/MPI/OpenMPI | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/make/extras/MPI/OpenMPI b/lib/make/extras/MPI/OpenMPI index b4b4a85a..73efd47a 100644 --- a/lib/make/extras/MPI/OpenMPI +++ b/lib/make/extras/MPI/OpenMPI @@ -6,7 +6,7 @@ # @desc # Configure Cactus to compile with the OpenMPI version of MPI. # @enddesc -# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/extras/MPI/OpenMPI,v 1.3 2006-05-13 16:33:09 swhite Exp $ +# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/extras/MPI/OpenMPI,v 1.4 2007-05-23 14:40:40 tradke Exp $ # @@*/ echo ' OpenMPI selected' @@ -36,7 +36,7 @@ if test -z "$OPENMPI_LIB_DIR" -o -z "$OPENMPI_INC_DIR" ; then # search for mpicxx.h which might be in an include subdirectory if test -r "$openmpi_includes/openmpi/ompi/mpi/cxx/mpicxx.h" ; then - openmpi_cxx_includes="$openmpi_includes/openmpi/ompi/" + openmpi_cxx_includes="$openmpi_includes/openmpi/" fi # don't explicitly add standard include search paths @@ -74,7 +74,15 @@ if test -z "$OPENMPI_LIB_DIR" -o -z "$OPENMPI_INC_DIR" ; then fi fi -MPI_LIBS='mpi orte opal mpi_cxx' +# which version of OpenMPI are we using ? +if test -x "$OPENMPI_DIR/bin/ompi_info" ; then + version=`$OPENMPI_DIR/bin/ompi_info --parsable | grep 'ompi:version:full' | cut -c19-` +fi + +MPI_LIBS='mpi mpi_cxx' +if test "$version" = '1.1'; then + MPI_LIBS='mpi orte opal mpi_cxx' +fi # if ompi_info program is available, can at least get the "prefix" # directory from that. |