From 0249dfcff07ca05034699123760fc0c40bc20079 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 11 Apr 2018 11:01:17 +0200
Subject: [PATCH] CONFIG: adjust paraview lib path for 5.5 (issue #793)

  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
---
 etc/config.csh/paraview | 13 ++++++++++---
 etc/config.sh/paraview  | 13 ++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/etc/config.csh/paraview b/etc/config.csh/paraview
index 4282eb21a7..8e862572d8 100644
--- a/etc/config.csh/paraview
+++ b/etc/config.csh/paraview
@@ -36,10 +36,15 @@
 #         setenv LD_LIBRARY_PATH ${ParaView_DIR}/lib/paraview-5.4:${LD_LIBRARY_PATH}
 #         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
 
-setenv ParaView_VERSION 5.4.1
+setenv ParaView_VERSION 5.5.0
 set    ParaView_QT=qt-system
 set cmake_version=cmake-system
 
@@ -127,8 +132,10 @@ if ( $?ParaView_VERSION ) then
             endif
         endif
 
-        # Prepend paraview libraries
-        setenv LD_LIBRARY_PATH "${pvLibDir}:${LD_LIBRARY_PATH}"
+        # Prepend paraview libraries.
+        # 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
             echo "Using paraview"
diff --git a/etc/config.sh/paraview b/etc/config.sh/paraview
index 20f60412d3..530c7ed052 100644
--- a/etc/config.sh/paraview
+++ b/etc/config.sh/paraview
@@ -36,13 +36,18 @@
 #         export LD_LIBRARY_PATH=$ParaView_DIR/lib/paraview-5.4:$LD_LIBRARY_PATH
 #         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
 #     When _foamAddLib is unset (eg, called from makeParaView or from foamPV):
 #       - the ParaView_VERSION variable is retained.
 #------------------------------------------------------------------------------
 # 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
 cmake_version=cmake-system
 
@@ -132,8 +137,10 @@ then
             done
         fi
 
-        # Prepend paraview libraries
-        export LD_LIBRARY_PATH=$pvLibDir:$LD_LIBRARY_PATH
+        # Prepend paraview libraries.
+        # 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
         if [ -r $pvPython ]
-- 
GitLab