etc/config/paraview.*: Update include/lib directory name seaching to paraview-3.0 for ParaView-4.?

This commit is contained in:
Henry Weller
2016-01-18 18:15:29 +00:00
parent 59b578f155
commit 5de9c43fb8
2 changed files with 4 additions and 4 deletions

View File

@ -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 # set paths if binaries or source are present
if ( -r $ParaView_DIR || -r $paraviewInstDir ) then if ( -r $ParaView_DIR || -r $paraviewInstDir ) then
setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/paraview-${ParaView_MAJOR} setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/paraview-${ParaView_MAJOR}
if (! -r $ParaView_INCLUDE_DIR && -r $ParaView_DIR/include/paraview) then if (! -r $ParaView_INCLUDE_DIR && -r $ParaView_DIR/include/paraview-3.0) then
setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/paraview setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/paraview-3.0
endif endif
set ParaView_LIB_DIR=${ParaView_DIR}/lib/paraview-${ParaView_MAJOR} set ParaView_LIB_DIR=${ParaView_DIR}/lib/paraview-${ParaView_MAJOR}

View File

@ -107,9 +107,9 @@ then
fi fi
ParaView_LIB_DIR=$ParaView_DIR/lib/paraview-$ParaView_MAJOR 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 then
ParaView_LIB_DIR=$ParaView_DIR/lib/paraview ParaView_LIB_DIR=$ParaView_DIR/lib/paraview-3.0
fi fi
export PATH=$ParaView_DIR/bin:$PATH export PATH=$ParaView_DIR/bin:$PATH