From 5de9c43fb80f83ba2997c29af6d4d3cdd1733429 Mon Sep 17 00:00:00 2001 From: Henry Weller <http://cfd.direct> Date: Mon, 18 Jan 2016 18:15:29 +0000 Subject: [PATCH] etc/config/paraview.*: Update include/lib directory name seaching to paraview-3.0 for ParaView-4.? --- etc/config/paraview.csh | 4 ++-- etc/config/paraview.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/config/paraview.csh b/etc/config/paraview.csh index eab513082d9..21a16fbbead 100644 --- a/etc/config/paraview.csh +++ b/etc/config/paraview.csh @@ -92,8 +92,8 @@ setenv ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraview # set paths if binaries or source are present if ( -r $ParaView_DIR || -r $paraviewInstDir ) then setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/paraview-${ParaView_MAJOR} - if (! -r $ParaView_INCLUDE_DIR && -r $ParaView_DIR/include/paraview) then - setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/paraview + if (! -r $ParaView_INCLUDE_DIR && -r $ParaView_DIR/include/paraview-3.0) then + setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/paraview-3.0 endif set ParaView_LIB_DIR=${ParaView_DIR}/lib/paraview-${ParaView_MAJOR} diff --git a/etc/config/paraview.sh b/etc/config/paraview.sh index a2a1373d433..3baaf61e231 100644 --- a/etc/config/paraview.sh +++ b/etc/config/paraview.sh @@ -107,9 +107,9 @@ then fi ParaView_LIB_DIR=$ParaView_DIR/lib/paraview-$ParaView_MAJOR - if [ ! -d $ParaView_LIB_DIR -a -d $ParaView_DIR/lib/paraview ] + if [ ! -d $ParaView_LIB_DIR -a -d $ParaView_DIR/lib/paraview-3.0 ] then - ParaView_LIB_DIR=$ParaView_DIR/lib/paraview + ParaView_LIB_DIR=$ParaView_DIR/lib/paraview-3.0 fi export PATH=$ParaView_DIR/bin:$PATH -- GitLab