Sophie

Sophie

distrib > Mageia > 7 > i586 > media > core-updates-src > by-pkgid > 982e772430fa61c0eecc50e1d5063a28 > files > 6

openfoam-7-4.mga7.src.rpm

--- OpenFOAM-7/etc/config.sh/paraview.orig	2019-07-05 15:06:58.000000000 +0200
+++ OpenFOAM-7/etc/config.sh/paraview	2019-09-16 13:22:38.159348217 +0200
@@ -68,7 +68,7 @@
 #export ParaView_VERSION=5.4.0
 #export ParaView_VERSION=5.5.0
 export ParaView_VERSION=5.6.0
-export ParaView_MAJOR=detect
+export ParaView_MAJOR=5.6
 
 #export ParaView_GL=system
 export ParaView_GL=mesa
@@ -107,10 +107,11 @@
 esac
 export ParaView_VERSION ParaView_MAJOR
 
-paraviewInstDir=$WM_THIRD_PARTY_DIR/ParaView-$ParaView_VERSION
-paraviewArchName=ParaView-$ParaView_VERSION
+paraviewInstDir=PVINSTLIBDIR/ParaView-$ParaView_VERSION
+paraviewArchName=ParaView-$ParaView_MAJOR
+
+export ParaView_DIR=/usr
 
-export ParaView_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraviewArchName
 
 # Set paths if binaries or source are present
 if [ -r $ParaView_DIR -o -r $paraviewInstDir ]
@@ -121,7 +122,7 @@
         export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview-3.0
     fi
 
-    ParaView_LIB_DIR=$ParaView_DIR/lib/paraview-$ParaView_MAJOR
+    ParaView_LIB_DIR=$ParaView_DIR/libARCH/paraview-$ParaView_MAJOR
 
     export PATH=$ParaView_DIR/bin:$PATH
     export LD_LIBRARY_PATH=$ParaView_LIB_DIR:$LD_LIBRARY_PATH
@@ -137,7 +138,8 @@
     fi
 
     # Add in python libraries if required
-    paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping
+#    paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping
+    paraviewPython=$ParaView_LIB_DIR/site-packages/paraview
     if [ -r $paraviewPython ]
     then
         if [ "$PYTHONPATH" ]