diff --git a/etc/settings.sh b/etc/settings.sh index 43026c121..13d68d33b 100644 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -244,6 +244,7 @@ MACPORTOPENMPI) # libDir=`mpicc-openmpi-$WM_MACPORT_MPI_VERSION --showme:libdirs` libDir=/opt/local/lib/openmpi-$WM_MACPORT_MPI_VERSION + export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$FOAM_MPI _foamAddLib $libDir unset libDir ;; @@ -252,6 +253,7 @@ MACPORTMPICH) export FOAM_MPI=mpich-macports-$WM_MACPORT_MPI_VERSION export MPI_HOME=$WM_THIRD_PARTY_DIR/$FOAM_MPI + export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$FOAM_MPI libDir=/opt/local/lib/mpich-$WM_MACPORT_MPI_VERSION _foamAddLib $libDir diff --git a/wmake/rules/darwinIntel64Clang/c++ b/wmake/rules/darwinIntel64Clang/c++ index c278cdc5f..8a8884c20 100644 --- a/wmake/rules/darwinIntel64Clang/c++ +++ b/wmake/rules/darwinIntel64Clang/c++ @@ -20,4 +20,4 @@ LINK_LIBS = $(c++DBUG) -lpthread LINKLIBSO = $(CC) $(c++FLAGS) -lpthread -dynamiclib -undefined dynamic_lookup # LINKEXE = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_LIBBIN) -lfoam -L$(FOAM_MPI_LIBBIN) -lPstream -LINKEXE = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_MPI_LIBBIN) -lPstream +LINKEXE = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_LIBBIN)/$(FOAM_MPI) -lPstream diff --git a/wmake/rules/darwinIntel64Dragonegg/c++ b/wmake/rules/darwinIntel64Dragonegg/c++ index 92fab6bc4..18e39113c 100644 --- a/wmake/rules/darwinIntel64Dragonegg/c++ +++ b/wmake/rules/darwinIntel64Dragonegg/c++ @@ -19,4 +19,4 @@ LINK_LIBS = $(c++DBUG) -lpthread LINKLIBSO = $(CC) $(c++FLAGS) -lpthread -dynamiclib -undefined dynamic_lookup # LINKEXE = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_LIBBIN) -lfoam -L$(FOAM_MPI_LIBBIN) -lPstream -LINKEXE = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_MPI_LIBBIN) -lPstream +LINKEXE = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_LIBBIN)/$(FOAM_MPI) -lPstream diff --git a/wmake/rules/darwinIntel64Gcc/c++ b/wmake/rules/darwinIntel64Gcc/c++ index 92fab6bc4..18e39113c 100644 --- a/wmake/rules/darwinIntel64Gcc/c++ +++ b/wmake/rules/darwinIntel64Gcc/c++ @@ -19,4 +19,4 @@ LINK_LIBS = $(c++DBUG) -lpthread LINKLIBSO = $(CC) $(c++FLAGS) -lpthread -dynamiclib -undefined dynamic_lookup # LINKEXE = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_LIBBIN) -lfoam -L$(FOAM_MPI_LIBBIN) -lPstream -LINKEXE = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_MPI_LIBBIN) -lPstream +LINKEXE = $(CC) $(c++FLAGS) -lpthread -L$(FOAM_LIBBIN)/$(FOAM_MPI) -lPstream