From 59e5f172c6420f1803303ea9942008423bf7cee0 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 6 Oct 2021 17:02:23 +0200
Subject: [PATCH] CONFIG: newer paraview finds its own libraries

- don't need to modify LD_LIBRARY_PATH
---
 etc/config.csh/paraview | 19 ++-----------------
 etc/config.sh/paraview  | 20 ++------------------
 2 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/etc/config.csh/paraview b/etc/config.csh/paraview
index b14625ff1f..e239cca2cd 100644
--- a/etc/config.csh/paraview
+++ b/etc/config.csh/paraview
@@ -174,23 +174,8 @@ default:
             end
         endif
 
-        # ParaView libraries
-        # - 5.4 and earlier: lib/paraview-X.X
-        # - 5.5 and later:   lib/, but could also be lib64/
-
-        foreach libDir ("lib$WM_COMPILER_LIB_ARCH" "lib")
-            set pvLibDir="${libDir}/paraview-${pv_api}"
-            if ( -d "${ParaView_DIR}/${pvLibDir}" ) then
-                switch ("$pv_api")
-                case 5.[0-4]*:
-                    set libDir="$pvLibDir"   # Needs lib/paraview-X.X (not lib)
-                    breaksw
-                endsw
-                setenv LD_LIBRARY_PATH "${ParaView_DIR}/${libDir}:${LD_LIBRARY_PATH}"
-                break
-            endif
-            set pvLibDir="unknown"
-        end
+        # Newer paraview finds its own libraries
+        # - don't need to modify LD_LIBRARY_PATH
 
         # OpenFOAM plugin directory must be the first in PV_PLUGIN_PATH
         # and have paraview-major.minor encoded in its name
diff --git a/etc/config.sh/paraview b/etc/config.sh/paraview
index ca2e235b78..e71b4a533e 100644
--- a/etc/config.sh/paraview
+++ b/etc/config.sh/paraview
@@ -152,24 +152,8 @@ case "$ParaView_VERSION" in
             done
         fi
 
-        # ParaView libraries
-        # - 5.4 and earlier: lib/paraview-X.X
-        # - 5.5 and later:   lib/, but could also be lib64/
-        for libDir in "lib$WM_COMPILER_LIB_ARCH" "lib"
-        do
-            pvLibDir="$libDir/paraview-$pv_api"
-            if [ -d "$ParaView_DIR/$pvLibDir" ]
-            then
-                case "$pv_api" in
-                (5.[0-4]*)
-                    libDir="$pvLibDir"   # Needs lib/paraview-X.X (not lib)
-                    ;;
-                esac
-                export LD_LIBRARY_PATH="$ParaView_DIR/$libDir:$LD_LIBRARY_PATH"
-                break
-            fi
-            unset pvLibDir
-        done
+        # Newer paraview finds its own libraries
+        # - don't need to modify LD_LIBRARY_PATH
 
         # OpenFOAM plugin directory must be the first in PV_PLUGIN_PATH
         # and have paraview-major.minor encoded in its name
-- 
2.31.1