zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

paraview: More corrections to library paths

Browse Source
This commit is contained in:
Will Bainbridge
2020-04-15 09:23:48 +01:00
parent 4f1beb3830
commit e3cd634104
2 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
etc/config.csh/paraview
View File

@ -25,7 +25,7 @@
# config.csh/paraview
#
# Description
# Setup file for paraview-[3-5].x
# Setup file for paraview-[4-5].x
# Sourced from OpenFOAM-<VERSION>/etc/cshrc or from foamPV alias
#
# Note
@ -77,7 +77,6 @@ while ( $#argv > 0 )
shift
end
# Set MAJOR version to correspond to VERSION
# ParaView_MAJOR is "<digits>.<digits>" from ParaView_VERSION
switch ("$ParaView_VERSION")
@ -92,22 +91,24 @@ case [0-9]*:
breaksw
endsw
set paraviewInstDir=$WM_THIRD_PARTY_DIR/ParaView-${ParaView_VERSION}
set paraviewArchName=ParaView-$ParaView_VERSION
setenv ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName
# Set the binary and source directories
setenv ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/ParaView-$ParaView_VERSION
set paraviewSrcDir=$WM_THIRD_PARTY_DIR/ParaView-${ParaView_VERSION}
# Set paths if binaries or source are present
if ( -r $ParaView_DIR || -r $paraviewInstDir ) then
if ( -d $ParaView_DIR || -d $paraviewSrcDir ) then
setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/paraview-${ParaView_MAJOR}
$WM_PROJECT_DIR/bin/tools/foamVersionCompare $ParaView_VERSION ge 5.5.0
if ( $status == 0 ) then
setenv ParaView_LIB_DIR ${ParaView_DIR}/lib*
else
setenv ParaView_LIB_DIR ${ParaView_DIR}/lib*/paraview-${ParaView_MAJOR}
set paraviewArch=
if ( -d $ParaView_DIR/lib64 ) then
set paraviewArch=64
endif
set paraviewLibSubDir=
$WM_PROJECT_DIR/bin/tools/foamVersionCompare $ParaView_VERSION lt 5.5.0
if ( $status == 0 ) then
set paraviewLibSubDir=/paraview-$ParaView_MAJOR
endif
setenv ParaView_LIB_DIR $ParaView_DIR/lib$paraviewArch$paraviewLibSubDir
setenv PATH ${ParaView_DIR}/bin:${PATH}
setenv LD_LIBRARY_PATH "${ParaView_LIB_DIR}:${LD_LIBRARY_PATH}"
@ -121,7 +122,6 @@ if ( -r $ParaView_DIR || -r $paraviewInstDir ) then
echo " PV_PLUGIN_PATH : $PV_PLUGIN_PATH"
endif
# Add in python libraries if required
set paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping
if ( -r $paraviewPython ) then
@ -131,12 +131,15 @@ if ( -r $ParaView_DIR || -r $paraviewInstDir ) then
setenv PYTHONPATH ${paraviewPython}:$ParaView_LIB_DIR
endif
endif
if ("$ParaView_GL" == mesa) alias paraview 'paraview --mesa'
# Alias paraview to launch with mesa if necessary
if ("$ParaView_GL" == mesa) then
alias paraview 'paraview --mesa'
endif
else
unsetenv PV_PLUGIN_PATH
endif
unset cleaned cmake paraviewInstDir paraviewPython
#------------------------------------------------------------------------------