paraview: Standardize the naming of the ParaView installation directory
Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1201
This commit is contained in:
@ -2,7 +2,7 @@
|
||||
# ========= |
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
# \\ / O peration |
|
||||
# \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
|
||||
# \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
@ -85,11 +85,6 @@ endsw
|
||||
set paraviewInstDir=$WM_THIRD_PARTY_DIR/ParaView-${ParaView_VERSION}
|
||||
set paraviewArchName=ParaView-$ParaView_VERSION
|
||||
|
||||
# Reset the name of the binary install directory for version 3
|
||||
if ( `echo $ParaView_VERSION | sed -e 's/^\([0-9][0-9]*\).*$/\1/'` == 3) then
|
||||
set paraviewArchName=paraview-$ParaView_VERSION
|
||||
endif
|
||||
|
||||
setenv ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName
|
||||
|
||||
# set paths if binaries or source are present
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# ========= |
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
# \\ / O peration |
|
||||
# \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
|
||||
# \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
@ -93,12 +93,6 @@ export ParaView_VERSION ParaView_MAJOR
|
||||
paraviewInstDir=$WM_THIRD_PARTY_DIR/ParaView-$ParaView_VERSION
|
||||
paraviewArchName=ParaView-$ParaView_VERSION
|
||||
|
||||
# Reset the name of the binary install directory for version 3
|
||||
if [ `echo $ParaView_VERSION | sed -e 's/^\([0-9][0-9]*\).*$/\1/'` -eq 3 ]
|
||||
then
|
||||
paraviewArchName=paraview-$ParaView_VERSION
|
||||
fi
|
||||
|
||||
export ParaView_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName
|
||||
|
||||
# set paths if binaries or source are present
|
||||
|
||||
Reference in New Issue
Block a user