zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CONFIG: adjust paraview lib path for 5.5 (issue #793)

Browse Source 
ParaView 5.4 and older:
    - requires lib/paraview-X.X only

  ParaView 5.5:
    - requires lib/
    - does not appear to require lib/paraview-X.X, but retained for simplicity

- Change default version to paraview-5.5.0 for testing purposes
This commit is contained in:
Mark Olesen
2018-04-11 11:01:17 +02:00
parent 6d8be52294
commit d814bce3ee
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
etc/config.csh/paraview
View File

@ -36,10 +36,15 @@
# setenv LD_LIBRARY_PATH ${ParaView_DIR}/lib/paraview-5.4:${LD_LIBRARY_PATH} # setenv LD_LIBRARY_PATH ${ParaView_DIR}/lib/paraview-5.4:${LD_LIBRARY_PATH}
# unsetenv ParaView_VERSION # avoid using ThirdParty settings # unsetenv ParaView_VERSION # avoid using ThirdParty settings
# #
# In newer versions (paraview 5.5), the contents of the lib/ changed
# and now need to include that as well:
#
# setenv LD_LIBRARY_PATH ${ParaView_DIR}/lib:${ParaView_DIR}/lib/paraview-5.5:${LD_LIBRARY_PATH}
#
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade # USER EDITABLE PART: Changes made here may be lost with the next upgrade
setenv ParaView_VERSION 5.4.1 setenv ParaView_VERSION 5.5.0
set ParaView_QT=qt-system set ParaView_QT=qt-system
set cmake_version=cmake-system set cmake_version=cmake-system
@ -127,8 +132,10 @@ if ( $?ParaView_VERSION ) then
endif endif
endif endif
# Prepend paraview libraries # Prepend paraview libraries.
setenv LD_LIBRARY_PATH "${pvLibDir}:${LD_LIBRARY_PATH}" # ParaView 5.4 and earlier - requires lib/paraview-X.X only
# ParaView 5.5 - requires lib/
setenv LD_LIBRARY_PATH "${ParaView_DIR}/lib:${pvLibDir}:${LD_LIBRARY_PATH}"
if ($?FOAM_VERBOSE && $?prompt) then if ($?FOAM_VERBOSE && $?prompt) then
echo "Using paraview" echo "Using paraview"

13
etc/config.sh/paraview
View File

@ -36,13 +36,18 @@
# export LD_LIBRARY_PATH=$ParaView_DIR/lib/paraview-5.4:$LD_LIBRARY_PATH # export LD_LIBRARY_PATH=$ParaView_DIR/lib/paraview-5.4:$LD_LIBRARY_PATH
# unset ParaView_VERSION # avoid using ThirdParty settings # unset ParaView_VERSION # avoid using ThirdParty settings
# #
# In newer versions (paraview 5.5), the contents of the lib/ changed
# and now need to include that as well:
#
# export LD_LIBRARY_PATH=$ParaView_DIR/lib:$ParaView_DIR/lib/paraview-5.5:$LD_LIBRARY_PATH
#
# Note # Note
# When _foamAddLib is unset (eg, called from makeParaView or from foamPV): # When _foamAddLib is unset (eg, called from makeParaView or from foamPV):
# - the ParaView_VERSION variable is retained. # - the ParaView_VERSION variable is retained.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade # USER EDITABLE PART: Changes made here may be lost with the next upgrade
ParaView_VERSION=5.4.1 ParaView_VERSION=5.5.0
ParaView_QT=qt-system ParaView_QT=qt-system
cmake_version=cmake-system cmake_version=cmake-system
@ -132,8 +137,10 @@ then
done done
fi fi
# Prepend paraview libraries # Prepend paraview libraries.
export LD_LIBRARY_PATH=$pvLibDir:$LD_LIBRARY_PATH # ParaView 5.4 and earlier - requires lib/paraview-X.X only
# ParaView 5.5 - requires lib/
export LD_LIBRARY_PATH=$ParaView_DIR/lib:$pvLibDir:$LD_LIBRARY_PATH
# Add in python libraries if required # Add in python libraries if required
if [ -r $pvPython ] if [ -r $pvPython ]