diff --git a/bin/tools/buildParaView3.2.1 b/bin/tools/buildParaView3.2.1 index 81a315fcee..ba4c91dcf1 100755 --- a/bin/tools/buildParaView3.2.1 +++ b/bin/tools/buildParaView3.2.1 @@ -87,7 +87,7 @@ fi # set paraview environment PARAVIEW_SRC_DIR=$PWD/$PARAVIEW_SRC #PARAVIEW_OBJ_DIR=$PARAVIEW_SRC_DIR/platforms/$WM_OPTIONS/obj$OBJ_ADD -PARAVIEW_OBJ_DIR=$PARAVIEW_SRC_DIR/platforms/$WM_OPTIONS +PARAVIEW_OBJ_DIR=$PARAVIEW_SRC_DIR/platforms/$WM_ARCH$WM_COMPILER # remove existing build folder if present if [ -e "$PARAVIEW_OBJ_DIR" ]; then diff --git a/bin/tools/buildParaViewFunctions b/bin/tools/buildParaViewFunctions index 4563caff35..6a9e5416e8 100755 --- a/bin/tools/buildParaViewFunctions +++ b/bin/tools/buildParaViewFunctions @@ -180,7 +180,7 @@ buildParaView () } # PARAVIEW_OBJ_DIR=$PARAVIEW_SRC_DIR/platforms/$WM_OPTIONS/obj$OBJ_ADD - PARAVIEW_OBJ_DIR=$PARAVIEW_SRC_DIR/platforms/$WM_OPTIONS + PARAVIEW_OBJ_DIR=$PARAVIEW_SRC_DIR/platforms/$WM_ARCH$WM_COMPILER # provide a shortcut for repeated builds - use with caution if [ "$CMAKE_SKIP" = YES ] diff --git a/etc/apps/paraview3/bashrc b/etc/apps/paraview3/bashrc index bed2ded08c..376ba3381c 100644 --- a/etc/apps/paraview3/bashrc +++ b/etc/apps/paraview3/bashrc @@ -48,7 +48,7 @@ fi export ParaView_VERSION="3.3-cvs" export ParaView_INST_DIR=$WM_PROJECT_INST_DIR/ThirdParty/ParaView$ParaView_VERSION -export ParaView_DIR=$ParaView_INST_DIR/platforms/$WM_OPTIONS +export ParaView_DIR=$ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER if [ "$PYTHONPATH" ]; then export PYTHONPATH=$PYTHONPATH:$ParaView_DIR/Utilities/VTKPythonWrapping diff --git a/etc/apps/paraview3/cshrc b/etc/apps/paraview3/cshrc index c54aa0536a..47064b2416 100644 --- a/etc/apps/paraview3/cshrc +++ b/etc/apps/paraview3/cshrc @@ -48,7 +48,7 @@ endif setenv ParaView_VERSION 3.3-cvs setenv ParaView_INST_DIR $WM_PROJECT_INST_DIR/ThirdParty/ParaView$ParaView_VERSION -setenv ParaView_DIR $ParaView_INST_DIR/platforms/$WM_OPTIONS +setenv ParaView_DIR $ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER if ($?PYTHONPATH) then setenv PYTHONPATH ${PYTHONPATH}:$ParaView_DIR/bin:$ParaView_DIR/Utilities/VTKPythonWrapping