From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Thu, 29 Sep 2022 11:50:08 +0000 (+0200)
Subject: Fix SOLVERLAB Paraview 5.11 compilation issue
X-Git-Tag: V9_11_0~299
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7bbd5dc0efb629f802412cf6e5c4d1c90b9ea263;p=tools%2Fsat_salome.git

Fix SOLVERLAB Paraview 5.11 compilation issue
---

diff --git a/products/SOLVERLAB.pyconf b/products/SOLVERLAB.pyconf
index 63397a2..bc4d90e 100644
--- a/products/SOLVERLAB.pyconf
+++ b/products/SOLVERLAB.pyconf
@@ -38,6 +38,7 @@ default :
         incremental : "yes"
         has_salome_gui : "yes"
     }
+    patches: []
 }
 
 default_MPI :
@@ -57,6 +58,7 @@ default_MPI :
         'openmpi'
     ]
     opt_depend : ['mpi4py']
+    patches: ['SOLVERLAB-paraview-5.11.patch']
 }
 
 version_V9_9_0_MPI :
diff --git a/products/patches/SOLVERLAB-paraview-5.11.patch b/products/patches/SOLVERLAB-paraview-5.11.patch
new file mode 100644
index 0000000..2df1085
--- /dev/null
+++ b/products/patches/SOLVERLAB-paraview-5.11.patch
@@ -0,0 +1,30 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e5a6860..e4fe656 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -534,7 +534,7 @@ if  ( DEFINED PARAVIEW_VERSION OR DEFINED ENV{PARAVIEW_VERSION} )
+   endif( NOT DEFINED PARAVIEW_VERSION )
+   message(STATUS "ParaView version is ${PARAVIEW_VERSION}" )
+ else( DEFINED PARAVIEW_VERSION OR DEFINED ENV{PARAVIEW_VERSION} )
+-  set( PARAVIEW_SUFFIXES paraview-5.0 paraview-5.1 paraview-5.2 paraview-5.3 paraview-5.4 paraview-5.5 paraview-5.6 paraview-5.7 paraview-5.8 paraview-5.9 )
++  set( PARAVIEW_SUFFIXES paraview-5.0 paraview-5.1 paraview-5.2 paraview-5.3 paraview-5.4 paraview-5.5 paraview-5.6 paraview-5.7 paraview-5.8 paraview-5.9 paraview-5.11)
+   find_file( vtkConfig_file vtkPVConfig.h HINTS ${PARAVIEW_INCLUDE_DIR} PATH_SUFFIXES ${PARAVIEW_SUFFIXES})
+ 
+   #extraction of the paraview version"
+@@ -558,13 +558,13 @@ else( DEFINED PARAVIEW_VERSION OR DEFINED ENV{PARAVIEW_VERSION} )
+ endif( DEFINED PARAVIEW_VERSION OR DEFINED ENV{PARAVIEW_VERSION} )
+ 
+ #Choose python 2 or 3  
+-IF   ( ${PARAVIEW_VERSION} STRGREATER "5.6" OR ${PARAVIEW_VERSION} STREQUAL "5.6" )#Use python 3, use VERSION_GREATER_EQUAL if cmake >=3.7
++IF   ( ${PARAVIEW_VERSION} VERSION_GREATER "5.6" OR ${PARAVIEW_VERSION} VERSION_EQUAL "5.6" )#Use python 3, use VERSION_GREATER_EQUAL if cmake >=3.7
+   SET(PYTHON2OR3 "3")
+   message(STATUS "PARAVIEW_VERSION greater than 5.6. We need python3 for postprocessing scripts.")
+-ELSE ( ${PARAVIEW_VERSION} STRGREATER "5.6" OR ${PARAVIEW_VERSION} STREQUAL "5.6" )#Use python 2
++ELSE ( ${PARAVIEW_VERSION} VERSION_GREATER "5.6" OR ${PARAVIEW_VERSION} VERSION_EQUAL "5.6" )#Use python 2
+   SET(PYTHON2OR3 "2")
+   message(STATUS "PARAVIEW_VERSION smaller than 5.6. We need python2 for postprocessing scripts.")
+-ENDIF( ${PARAVIEW_VERSION} STRGREATER "5.6" OR ${PARAVIEW_VERSION} STREQUAL "5.6" )
++ENDIF( ${PARAVIEW_VERSION} VERSION_GREATER "5.6" OR ${PARAVIEW_VERSION} VERSION_EQUAL "5.6" )
+ 
+ # Find python
+ IF   ( PYTHON_ROOT_DIR OR DEFINED ENV{PYTHON_ROOT_DIR})