From bab7f11792eeb62bc669e978489e812754195326 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Tue, 3 Jun 2008 21:34:07 +0100
Subject: [PATCH] Corrected for relacation of src/other to
$WM_PROJECT_INST_DIR/ThirdParty
---
Allwmake | 10 ++++++----
etc/settings.csh | 13 +++++++++----
etc/settings.sh | 13 +++++++++----
src/Allwmake | 2 --
.../MGridGenGamgAgglomeration/Allwmake | 2 --
.../MGridGenGAMGAgglomeration/Make/options | 2 +-
.../decompositionMethods/Make/options | 2 +-
.../parMetisDecomp/Make/options | 4 ++--
8 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/Allwmake b/Allwmake
index 414bb04f62d..a311597d39e 100755
--- a/Allwmake
+++ b/Allwmake
@@ -1,13 +1,15 @@
#!/bin/sh
set -x
-( cd wmake && ./makeWmake )
+(cd $WM_PROJECT_INST_DIR/ThirdParty && ./Allwmake)
-( cd src && ./Allwmake )
+(cd wmake && ./makeWmake)
-( cd applications && ./Allwmake )
+(cd src && ./Allwmake)
+
+(cd applications && ./Allwmake)
if [ "$1" = doc ]
then
- ( cd doc && ./Allwmake)
+ (cd doc && ./Allwmake)
fi
diff --git a/etc/settings.csh b/etc/settings.csh
index 10bce2b685a..73b340e9e95 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -121,10 +121,15 @@ if ($?WM_COMPILER_BIN) then
endif
+# Third-party software
+# ~~~~~~~~~~~~~~~~~~~~
+set thirdParty=$WM_PROJECT_INST_DIR/ThirdParty
+
+
# MICO
# ~~~~
setenv MICO_VERSION 2.3.12
-setenv MICO_PATH $FOAM_SRC/other/mico-$MICO_VERSION
+setenv MICO_PATH $thirdParty/mico-$MICO_VERSION
setenv MICO_ARCH_PATH $MICO_PATH/platforms/$WM_OPTIONS
set path=($MICO_ARCH_PATH/bin $path)
@@ -158,7 +163,7 @@ endif
switch ("$WM_MPLIB")
case OPENMPI:
set ompi_version=1.2.6
- setenv OPENMPI_HOME $FOAM_SRC/other/openmpi-$ompi_version
+ setenv OPENMPI_HOME $thirdParty/openmpi-$ompi_version
setenv OPENMPI_ARCH_PATH $OPENMPI_HOME/platforms/$WM_OPTIONS
# Tell OpenMPI where to find it's install directory
@@ -173,7 +178,7 @@ case OPENMPI:
case LAM:
set lam_version=7.1.4
- setenv LAMHOME $FOAM_SRC/other/lam-$lam_version
+ setenv LAMHOME $thirdParty/lam-$lam_version
setenv LAM_ARCH_PATH $LAMHOME/platforms/$WM_OPTIONS
AddLib $LAM_ARCH_PATH/lib
@@ -185,7 +190,7 @@ case LAM:
case MPICH:
set mpich_version=1.2.4
- setenv MPICH_PATH $FOAM_SRC/other/mpich-$mpich_version
+ setenv MPICH_PATH $thirdParty/mpich-$mpich_version
setenv MPICH_ARCH_PATH $MPICH_PATH/platforms/$WM_OPTIONS
setenv MPICH_ROOT $MPICH_ARCH_PATH
diff --git a/etc/settings.sh b/etc/settings.sh
index 8bb969a3561..9d577d605e3 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -128,10 +128,15 @@ if [ "$WM_COMPILER_BIN" != "" ]; then
fi
+# Third-party software
+# ~~~~~~~~~~~~~~~~~~~~
+thirdParty=$WM_PROJECT_INST_DIR/ThirdParty
+
+
# MICO
# ~~~~
export MICO_VERSION=2.3.12
-export MICO_PATH=$FOAM_SRC/other/mico-$MICO_VERSION
+export MICO_PATH=$thirdParty/mico-$MICO_VERSION
export MICO_ARCH_PATH=$MICO_PATH/platforms/$WM_OPTIONS
export PATH=$MICO_ARCH_PATH/bin:$PATH
@@ -159,7 +164,7 @@ export FOAMX_CONFIG
case "$WM_MPLIB" in
OPENMPI)
ompi_version=1.2.6
- export OPENMPI_HOME=$FOAM_SRC/other/openmpi-$ompi_version
+ export OPENMPI_HOME=$thirdParty/openmpi-$ompi_version
export OPENMPI_ARCH_PATH=$OPENMPI_HOME/platforms/$WM_OPTIONS
# Tell OpenMPI where to find it's install directory
@@ -174,7 +179,7 @@ OPENMPI)
LAM)
lam_version=7.1.4
- export LAMHOME=$FOAM_SRC/other/lam-$lam_version
+ export LAMHOME=$thirdParty/lam-$lam_version
export LAM_ARCH_PATH=$LAMHOME/platforms/$WM_OPTIONS
AddLib $LAM_ARCH_PATH/lib
@@ -186,7 +191,7 @@ LAM)
MPICH)
mpich_version=1.2.4
- export MPICH_PATH=$FOAM_SRC/other/mpich-$mpich_version
+ export MPICH_PATH=$thirdParty/mpich-$mpich_version
export MPICH_ARCH_PATH=$MPICH_PATH/platforms/$WM_OPTIONS
export MPICH_ROOT=$MPICH_ARCH_PATH
diff --git a/src/Allwmake b/src/Allwmake
index d98d1bed0aa..1db8264e3f7 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -2,9 +2,7 @@
set -x
( cd OpenFOAM && wmakeLnInclude . )
-( cd other && ./Allwmake )
( cd Pstream && ./Allwmake )
-
wmake libo OSspecific/$WM_OS
wmake libso OpenFOAM
diff --git a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Allwmake b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Allwmake
index 79013a6d773..98f16e38eb0 100755
--- a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Allwmake
+++ b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Allwmake
@@ -1,3 +1 @@
-wmake libso ParMGridGen-1.0/MGridGen/IMlib
-wmake libso ParMGridGen-1.0/MGridGen/Lib
wmake libso MGridGenGAMGAgglomeration
diff --git a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/Make/options b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/Make/options
index 8a23c38729d..8b8d0b69132 100644
--- a/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/Make/options
+++ b/src/decompositionAgglomeration/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration/Make/options
@@ -1,4 +1,4 @@
-ParMGridGen = $(LIB_SRC)/decompositionAgglomeration/MGridGenGamgAgglomeration/ParMGridGen-1.0
+ParMGridGen = ${WM_PROJECT_INST_DIR}/ThirdParty/ParMGridGen-1.0
TYPE_REAL=
#if defined(SP)
diff --git a/src/decompositionAgglomeration/decompositionMethods/Make/options b/src/decompositionAgglomeration/decompositionMethods/Make/options
index 224af2cdfcf..041b8c71808 100644
--- a/src/decompositionAgglomeration/decompositionMethods/Make/options
+++ b/src/decompositionAgglomeration/decompositionMethods/Make/options
@@ -1,5 +1,5 @@
EXE_INC = \
- -I$(FOAM_SRC)/other/metis-5.0pre2/include
+ -I${WM_PROJECT_INST_DIR}/ThirdParty/metis-5.0pre2/include
LIB_LIBS = \
-lmetis \
diff --git a/src/decompositionAgglomeration/parMetisDecomp/Make/options b/src/decompositionAgglomeration/parMetisDecomp/Make/options
index 2bbedb99301..eb2850d9e2a 100644
--- a/src/decompositionAgglomeration/parMetisDecomp/Make/options
+++ b/src/decompositionAgglomeration/parMetisDecomp/Make/options
@@ -2,8 +2,8 @@ include $(RULES)/mplib$(WM_MPLIB)
EXE_INC = \
$(PFLAGS) $(PINC) \
- -I$(FOAM_SRC)/other/ParMetis-3.1/ParMETISLib \
- -I$(FOAM_SRC)/other/ParMetis-3.1 \
+ -I${WM_PROJECT_INST_DIR}/ThirdParty/ParMetis-3.1/ParMETISLib \
+ -I${WM_PROJECT_INST_DIR}/ThirdParty/ParMetis-3.1 \
-I../decompositionMethods/lnInclude
LIB_LIBS = \
--
GitLab