Merge remote-tracking branch 'origin/nr/HakanNilssonRH6' into nextRelease
Conflicts: src/Allwmake
This commit is contained in:
commit
460ffb67a6
2 changed files with 2 additions and 2 deletions
3
ThirdParty/AllMake.stage3
vendored
3
ThirdParty/AllMake.stage3
vendored
|
@ -68,7 +68,8 @@ fi
|
|||
# ParMGridGen
|
||||
if [ -z "$PARMGRIDGEN_SYSTEM" ]
|
||||
then
|
||||
( rpm_make -p ParMGridGen-1.0 -s ParMGridGen-1.0.spec -u http://www.mgnet.org/mgnet/Codes/parmgridgen/ParMGridGen-1.0.tar.gz )
|
||||
#( rpm_make -p ParMGridGen-1.0 -s ParMGridGen-1.0.spec -u http://www.mgnet.org/mgnet/Codes/parmgridgen/ParMGridGen-1.0.tar.gz )
|
||||
( rpm_make -p ParMGridGen-1.0 -s ParMGridGen-1.0.spec -u ftp://ftp.proxad.net/.mirrors1/ftp.freebsd.org/ports/distfiles/ParMGridGen-1.0.tar.gz )
|
||||
else
|
||||
echo "Using system installed ParMGridGen"
|
||||
echo ""
|
||||
|
|
|
@ -3,7 +3,6 @@ cd ${0%/*} || exit 1 # run from this directory
|
|||
set -x
|
||||
|
||||
# Make meshMotion solvers
|
||||
wmake libso solidBodyMotion
|
||||
wmake libso fvMotionSolver
|
||||
wmake libso RBFMotionSolver
|
||||
wmake libso mesquiteMotionSolver
|
||||
|
|
Reference in a new issue