zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

etc/config/paraview.*: Update include directory name which is 3.0 rather than 4.0 even for ParaView-4

Browse Source
This commit is contained in:
Henry Weller
2016-01-10 19:16:27 +00:00
parent d41014938c
commit 33c99cc918
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
etc/config/paraview.csh
View File

@ -2,7 +2,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
@ -97,8 +97,8 @@ if ( -r $ParaView_DIR || -r $paraviewInstDir ) then
endif endif
set ParaView_LIB_DIR=${ParaView_DIR}/lib/paraview-${ParaView_MAJOR} set ParaView_LIB_DIR=${ParaView_DIR}/lib/paraview-${ParaView_MAJOR}
if (! -r $ParaView_LIB_DIR && -r ${ParaView_DIR}/lib/paraview) then if (! -r $ParaView_LIB_DIR && -r ${ParaView_DIR}/lib/paraview-3.0) then
set ParaView_LIB_DIR=${ParaView_DIR}/lib/paraview set ParaView_LIB_DIR=${ParaView_DIR}/lib/paraview-3.0
endif endif
setenv PATH ${ParaView_DIR}/bin:${PATH} setenv PATH ${ParaView_DIR}/bin:${PATH}

6
etc/config/paraview.sh
View File

@ -2,7 +2,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
@ -101,9 +101,9 @@ export ParaView_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraview
if [ -r $ParaView_DIR -o -r $paraviewInstDir ] if [ -r $ParaView_DIR -o -r $paraviewInstDir ]
then then
export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview-$ParaView_MAJOR export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview-$ParaView_MAJOR
if [ ! -d $ParaView_INCLUDE_DIR -a -d $ParaView_DIR/include/paraview ] if [ ! -d $ParaView_INCLUDE_DIR -a -d $ParaView_DIR/include/paraview-3.0 ]
then then
export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview-3.0
fi fi
ParaView_LIB_DIR=$ParaView_DIR/lib/paraview-$ParaView_MAJOR ParaView_LIB_DIR=$ParaView_DIR/lib/paraview-$ParaView_MAJOR