From ee199b9e9a145409b261a34ca66053c236ccd844 Mon Sep 17 00:00:00 2001 From: Mark Olesen <Mark.Olesen@Germany> Date: Fri, 12 Mar 2010 17:41:15 +0100 Subject: [PATCH] BUG: new 3rdParty location for cmake and paraview was not getting cleaned from the path --- etc/apps/paraview3/bashrc | 2 +- etc/apps/paraview3/cshrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/apps/paraview3/bashrc b/etc/apps/paraview3/bashrc index 83f8294c001..6d64ee1be41 100644 --- a/etc/apps/paraview3/bashrc +++ b/etc/apps/paraview3/bashrc @@ -35,7 +35,7 @@ #------------------------------------------------------------------------------ # clean the PATH -cleanedEnv=`$WM_PROJECT_DIR/bin/foamCleanPath "$PATH" "$WM_THIRD_PARTY_DIR/cmake- $WM_THIRD_PARTY_DIR/paraview-"` && PATH="$cleanedEnv" +cleanedEnv=`$WM_PROJECT_DIR/bin/foamCleanPath "$PATH" "$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/cmake- $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-"` && PATH="$cleanedEnv" # determine the cmake to be used unset CMAKE_HOME diff --git a/etc/apps/paraview3/cshrc b/etc/apps/paraview3/cshrc index ac89e09cd32..70b296cce93 100644 --- a/etc/apps/paraview3/cshrc +++ b/etc/apps/paraview3/cshrc @@ -35,7 +35,7 @@ #------------------------------------------------------------------------------ # clean the PATH -set cleanedEnv=`$WM_PROJECT_DIR/bin/foamCleanPath -space "$path" "$WM_THIRD_PARTY_DIR/cmake- $WM_THIRD_PARTY_DIR/paraview-"` +set cleanedEnv=`$WM_PROJECT_DIR/bin/foamCleanPath -space "$path" "$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/cmake- $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-"` if ( $status == 0 ) set path=($cleanedEnv) # determine the cmake to be used -- GitLab