aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsbrandt <sbrandt@043a8217-7a68-40fe-abfd-36aa7d4fa6a8>2014-09-16 01:49:10 +0000
committersbrandt <sbrandt@043a8217-7a68-40fe-abfd-36aa7d4fa6a8>2014-09-16 01:49:10 +0000
commit429bfa52f9b9c902102e3769748d66f988eddc32 (patch)
tree74eb2a06238dc56f0e3032d2450c826bd50c4800
parente0fbac258f64198de1ee8b6127200f145f04226d (diff)
ticket 1653: ExternalLibraries/MPI missing C++ library names
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/MPI/trunk@47 043a8217-7a68-40fe-abfd-36aa7d4fa6a8
-rw-r--r--configure.pl9
1 files changed, 6 insertions, 3 deletions
diff --git a/configure.pl b/configure.pl
index d2bc962..b100fbe 100644
--- a/configure.pl
+++ b/configure.pl
@@ -66,12 +66,15 @@ if("$ENV{MPI_DIR}" =~ /^\s*$/) {
# Search
################################################################################
if($mpi_search and !defined($mpi_cmd)) {
- $mpi_cmd = which("mpicc");
+ $mpi_cmd = which("mpic++");
+ $mpi_cmd = which("mpiCC") unless(defined($mpi_cmd));
+ $mpi_cmd = which("mpicxx") unless(defined($mpi_cmd));
+ $mpi_cmd = which("mpicc") unless(defined($mpi_cmd));
if(defined($mpi_cmd)) {
$mpi_dir = $mpi_cmd;
- $mpi_dir =~ s{/mpicc$}{};
+ $mpi_dir =~ s{/mpi(c\+\+|CC|cc|cxx)$}{};
$mpi_dir =~ s{/bin$}{};
- message("Found mpicc at $mpi_cmd!");
+ message("Found mpi compiler wrapper at $mpi_cmd!");
mpi_get_info();
}
}