diff --git a/etc/apps/paraview3/cshrc b/etc/apps/paraview3/cshrc index 33c863215e..fdd1e819cf 100644 --- a/etc/apps/paraview3/cshrc +++ b/etc/apps/paraview3/cshrc @@ -44,8 +44,8 @@ foreach cmake ( cmake-2.6.4 cmake-2.6.2 cmake-2.4.6 ) endif end -set paraviewMajor=paraview-3.6 -setenv ParaView_VERSION 3.6.1 +if ( ! $?ParaView_MAJOR ) setenv ParaView_MAJOR paraview-3.6 +if ( ! $?ParaView_VERSION ) setenv ParaView_VERSION 3.6.1 setenv ParaView_INST_DIR $WM_THIRD_PARTY_DIR/paraview-$ParaView_VERSION setenv ParaView_DIR $ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER @@ -54,9 +54,9 @@ setenv ParaView_DIR $ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER set paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping if ( -r $paraviewPython ) then if ($?PYTHONPATH) then - setenv PYTHONPATH ${PYTHONPATH}:${paraviewPython}:$ParaView_DIR/lib/${paraviewMajor} + setenv PYTHONPATH ${PYTHONPATH}:${paraviewPython}:$ParaView_DIR/lib/${ParaView_MAJOR} else - setenv PYTHONPATH ${paraviewPython}:$ParaView_DIR/lib/${paraviewMajor} + setenv PYTHONPATH ${paraviewPython}:$ParaView_DIR/lib/${ParaView_MAJOR} endif endif @@ -65,5 +65,5 @@ if ( -r $ParaView_INST_DIR ) then setenv PV_PLUGIN_PATH $FOAM_LIBBIN/paraview endif -unset cmake paraviewMajor paraviewPython +unset cmake paraviewPython # -----------------------------------------------------------------------------