updated to enable alternative builds if env variables set externally

This commit is contained in:
andy
2009-11-24 13:07:12 +00:00
parent 95b2a4d39b
commit bfc0926c8b

View File

@ -46,21 +46,22 @@ do
fi fi
done done
paraviewMajor=paraview-3.6 # set MAJOR and VERSION variables if not already set
export ParaView_VERSION=3.6.1 [ -z "$ParaView_MAJOR" ] && export ParaView_MAJOR=paraview-3.6
[ -z "$ParaView_VERSION" ] && export ParaView_VERSION=3.6.1
export ParaView_INST_DIR=$WM_THIRD_PARTY_DIR/paraview-$ParaView_VERSION export ParaView_INST_DIR=$WM_THIRD_PARTY_DIR/paraview-$ParaView_VERSION
export ParaView_DIR=$ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER export ParaView_DIR=$ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER
# add in python libraries if required # add in python libraries if required
paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping ParaView_PYTHON_DIR=$ParaView_DIR/Utilities/VTKPythonWrapping
if [ -r $paraviewPython ] if [ -r $ParaView_PYTHON_DIR ]
then then
if [ "$PYTHONPATH" ] if [ "$PYTHONPATH" ]
then then
export PYTHONPATH=$PYTHONPATH:$paraviewPython:$ParaView_DIR/lib/$paraviewMajor export PYTHONPATH=$PYTHONPATH:$ParaView_PYTHON_DIR:$ParaView_DIR/lib/$ParaView_MAJOR
else else
export PYTHONPATH=$paraviewPython:$ParaView_DIR/lib/$paraviewMajor export PYTHONPATH=$ParaView_PYTHON_DIR:$ParaView_DIR/lib/$ParaView_MAJOR
fi fi
fi fi
@ -70,5 +71,5 @@ then
export PV_PLUGIN_PATH=$FOAM_LIBBIN export PV_PLUGIN_PATH=$FOAM_LIBBIN
fi fi
unset cmake paraviewMajor paraviewPython unset cmake ParaView_PYTHON_DIR
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------