Commit 33c99cc9 authored by Henry Weller's avatar Henry Weller
Browse files

etc/config/paraview.*: Update include directory name which is 3.0 rather than...

etc/config/paraview.*: Update include directory name which is 3.0 rather than 4.0 even for ParaView-4
parent d4101493
......@@ -2,7 +2,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
......@@ -97,8 +97,8 @@ if ( -r $ParaView_DIR || -r $paraviewInstDir ) then
endif
set ParaView_LIB_DIR=${ParaView_DIR}/lib/paraview-${ParaView_MAJOR}
if (! -r $ParaView_LIB_DIR && -r ${ParaView_DIR}/lib/paraview) then
set ParaView_LIB_DIR=${ParaView_DIR}/lib/paraview
if (! -r $ParaView_LIB_DIR && -r ${ParaView_DIR}/lib/paraview-3.0) then
set ParaView_LIB_DIR=${ParaView_DIR}/lib/paraview-3.0
endif
setenv PATH ${ParaView_DIR}/bin:${PATH}
......
......@@ -2,7 +2,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation |
#------------------------------------------------------------------------------
# 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 ]
then
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
export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview
export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview-3.0
fi
ParaView_LIB_DIR=$ParaView_DIR/lib/paraview-$ParaView_MAJOR
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment