From 33c99cc91856f68f79cced270771a0fc466ab9b9 Mon Sep 17 00:00:00 2001 From: Henry Weller <http://cfd.direct> Date: Sun, 10 Jan 2016 19:16:27 +0000 Subject: [PATCH] etc/config/paraview.*: Update include directory name which is 3.0 rather than 4.0 even for ParaView-4 --- etc/config/paraview.csh | 6 +++--- etc/config/paraview.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/etc/config/paraview.csh b/etc/config/paraview.csh index f81a894d11e..eab513082d9 100644 --- a/etc/config/paraview.csh +++ b/etc/config/paraview.csh @@ -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} diff --git a/etc/config/paraview.sh b/etc/config/paraview.sh index 6b345008818..a2a1373d433 100644 --- a/etc/config/paraview.sh +++ b/etc/config/paraview.sh @@ -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 -- GitLab