ThirdParty: Correction for compiling ParaView with available qmake
This commit is contained in:
parent
1d2f5551ac
commit
983856d409
2 changed files with 5 additions and 8 deletions
3
ThirdParty/AllMake.stage4
vendored
3
ThirdParty/AllMake.stage4
vendored
|
@ -65,7 +65,6 @@ else
|
||||||
echo ""
|
echo ""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
# Paraview
|
# Paraview
|
||||||
if [ -z "$PARAVIEW_SYSTEM" ]
|
if [ -z "$PARAVIEW_SYSTEM" ]
|
||||||
then
|
then
|
||||||
|
@ -75,7 +74,7 @@ then
|
||||||
if [ -d "$QT_BIN_DIR" -a -r "$QT_BIN_DIR"/qmake ]
|
if [ -d "$QT_BIN_DIR" -a -r "$QT_BIN_DIR"/qmake ]
|
||||||
then
|
then
|
||||||
( rpm_make -p ParaView-3.8.1 -s ParaView-3.8.1.spec -u http://www.paraview.org/files/v3.8/ParaView-3.8.1.tar.gz \
|
( rpm_make -p ParaView-3.8.1 -s ParaView-3.8.1.spec -u http://www.paraview.org/files/v3.8/ParaView-3.8.1.tar.gz \
|
||||||
-D '_qmakePath $QT_BIN_DIR/qmake'
|
-a --define='_qmakePath $QT_BIN_DIR/qmake'
|
||||||
)
|
)
|
||||||
else
|
else
|
||||||
echo "WARNING: "
|
echo "WARNING: "
|
||||||
|
|
10
ThirdParty/tools/makeThirdPartyFunctionsForRPM
vendored
10
ThirdParty/tools/makeThirdPartyFunctionsForRPM
vendored
|
@ -49,6 +49,9 @@ echo ""
|
||||||
#
|
#
|
||||||
rpm_make()
|
rpm_make()
|
||||||
{
|
{
|
||||||
|
# Avoid word splitting on 'space'
|
||||||
|
IFS=$'\n'
|
||||||
|
|
||||||
# sort arguments
|
# sort arguments
|
||||||
_PACKAGE=''
|
_PACKAGE=''
|
||||||
_SPECFILE=''
|
_SPECFILE=''
|
||||||
|
@ -96,11 +99,6 @@ rpm_make()
|
||||||
#
|
#
|
||||||
cd $buildBase
|
cd $buildBase
|
||||||
|
|
||||||
# Here, the logic is fairly simple:
|
|
||||||
# We assume that the 2nd command-line parameter is necessarily the URL for dowmloading the package.
|
|
||||||
# If more than 2 command-line parameters are supplied, we assume that these additional parameters
|
|
||||||
# are for the command rpmbuild.
|
|
||||||
# This is a bit fragile, improvements will come later if necessary.
|
|
||||||
#
|
#
|
||||||
# Do we need to download the package using the supplied URL
|
# Do we need to download the package using the supplied URL
|
||||||
if [ -n "$_PACKAGE_URL" ]; then
|
if [ -n "$_PACKAGE_URL" ]; then
|
||||||
|
@ -113,7 +111,7 @@ rpm_make()
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Making package $_PACKAGE using RPM."
|
echo "Making package $_PACKAGE using RPM."
|
||||||
rpm_build $_PACKAGE $_SPECFILE $_ADDITIONALFLAGS "$@"
|
rpm_build ${_PACKAGE} ${_SPECFILE} ${_ADDITIONALFLAGS} "$@"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Install RPM package if not done already
|
# Install RPM package if not done already
|
||||||
|
|
Reference in a new issue