FEATURE: Re-enabled paraview compilation by default. Moved 3rd party sources to SourceForge. Dominik Christ.
This commit is contained in:
parent
f0402cc4cd
commit
ef26ee1688
5 changed files with 13 additions and 9 deletions
4
ThirdParty/AllMake.stage2
vendored
4
ThirdParty/AllMake.stage2
vendored
|
@ -101,7 +101,9 @@ then
|
|||
#
|
||||
[ ! -z "$WM_THIRD_PARTY_USE_OPENMPI_1*$" ] && {
|
||||
echo "Building openmpi 1.8.4"
|
||||
( rpm_make -p openmpi-1.8.4 -s openmpi-1.8.4.spec -u http://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.4.tar.gz \
|
||||
#( rpm_make -p openmpi-1.8.4 -s openmpi-1.8.4.spec -u http://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.4.tar.gz \
|
||||
# -f --define '_configureAdditionalArgs "$WM_THIRD_PARTY_USE_OPENMPI_165_ConfigureAdditionalArgs"')
|
||||
( rpm_make -p openmpi-1.8.4 -s openmpi-1.8.4.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/openmpi-1.8.4.tar.gz \
|
||||
-f --define '_configureAdditionalArgs "$WM_THIRD_PARTY_USE_OPENMPI_165_ConfigureAdditionalArgs"')
|
||||
}
|
||||
else
|
||||
|
|
10
ThirdParty/AllMake.stage3
vendored
10
ThirdParty/AllMake.stage3
vendored
|
@ -77,8 +77,8 @@ then
|
|||
#
|
||||
[ ! -z "$WM_THIRD_PARTY_USE_PARMGRIDGEN_10" ] && {
|
||||
echo "Building ParMGridGen 1.0"
|
||||
( 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://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/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 http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/ParMGridGen-1.0.tar.gz )
|
||||
}
|
||||
else
|
||||
echo "Using system installed ParMGridGen"
|
||||
|
@ -126,7 +126,8 @@ then
|
|||
#
|
||||
[ ! -z "$WM_THIRD_PARTY_USE_SCOTCH_604" ] && {
|
||||
echo "Building Scotch 6.0.4"
|
||||
( rpm_make -p scotch-6.0.4 -s scotch-6.0.4.spec -u http://gforge.inria.fr/frs/download.php/file/34618/scotch_6.0.4.tar.gz )
|
||||
#( rpm_make -p scotch-6.0.4 -s scotch-6.0.4.spec -u http://gforge.inria.fr/frs/download.php/file/34618/scotch_6.0.4.tar.gz )
|
||||
( rpm_make -p scotch-6.0.4 -s scotch-6.0.4.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/scotch_6.0.4.tar.gz )
|
||||
}
|
||||
# Scotch 6.0.0
|
||||
#
|
||||
|
@ -194,7 +195,8 @@ then
|
|||
#
|
||||
[ ! -z "$WM_THIRD_PARTY_USE_HWLOC_1101" ] && {
|
||||
echo "Building hwloc 1.10.1"
|
||||
( rpm_make -p hwloc-1.10.1 -s hwloc-1.10.1.spec -u http://www.open-mpi.org/software/hwloc/v1.10/downloads/hwloc-1.10.1.tar.gz )
|
||||
# ( rpm_make -p hwloc-1.10.1 -s hwloc-1.10.1.spec -u http://www.open-mpi.org/software/hwloc/v1.10/downloads/hwloc-1.10.1.tar.gz )
|
||||
( rpm_make -p hwloc-1.10.1 -s hwloc-1.10.1.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/hwloc-1.10.1.tar.gz )
|
||||
}
|
||||
# hwloc 1.7.2
|
||||
#
|
||||
|
|
4
ThirdParty/AllMake.stage4
vendored
4
ThirdParty/AllMake.stage4
vendored
|
@ -90,7 +90,7 @@ then
|
|||
#
|
||||
[ ! -z "$WM_THIRD_PARTY_USE_PARAVIEW_410" ] && {
|
||||
echo "Building ParaView 4.1.0"
|
||||
( rpm_make -p ParaView-4.1.0 -s ParaView-4.1.0.spec -u http://www.paraview.org/files/v4.1/ParaView-v4.1.0-source.tar.gz \
|
||||
( rpm_make -p ParaView-4.1.0 -s ParaView-4.1.0.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/ParaView-v4.1.0-source.tar.gz \
|
||||
-f --define='_qmakePath $QT_BIN_DIR/qmake'
|
||||
)
|
||||
}
|
||||
|
@ -98,7 +98,7 @@ then
|
|||
#
|
||||
[ ! -z "$WM_THIRD_PARTY_USE_PARAVIEW_431" ] && {
|
||||
echo "Building ParaView 4.3.1"
|
||||
( rpm_make -p ParaView-4.3.1 -s ParaView-4.3.1.spec -u http://www.paraview.org/files/v4.3/ParaView-v4.3.1-source.tar.gz \
|
||||
( rpm_make -p ParaView-4.3.1 -s ParaView-4.3.1.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/ParaView-v4.3.1-source.tar.gz \
|
||||
-f --define='_qmakePath $QT_BIN_DIR/qmake'
|
||||
)
|
||||
}
|
||||
|
|
2
ThirdParty/rpmBuild/SPECS/scotch-6.0.4.spec
vendored
2
ThirdParty/rpmBuild/SPECS/scotch-6.0.4.spec
vendored
|
@ -71,7 +71,7 @@ License: Unkown
|
|||
Name: %{name}
|
||||
Version: %{version}
|
||||
Release: %{release}
|
||||
URL: https://gforge.inria.fr/frs/download.php/31831
|
||||
URL: https://gforge.inria.fr/frs/download.php/file/34618/
|
||||
Source: %url/%{name}_%{version}.tar.gz
|
||||
Prefix: %{_prefix}
|
||||
Group: Development/Tools
|
||||
|
|
|
@ -105,7 +105,7 @@ export WM_THIRD_PARTY_USE_HWLOC_1101=1
|
|||
#
|
||||
# For AllMake.stage4
|
||||
#export WM_THIRD_PARTY_USE_QT_486=1
|
||||
#export WM_THIRD_PARTY_USE_PARAVIEW_431=1
|
||||
export WM_THIRD_PARTY_USE_PARAVIEW_431=1
|
||||
|
||||
|
||||
# Source files, possibly with some verbosity
|
||||
|
|
Reference in a new issue