From: Quentin Cozette <quentin.cozette@cea.fr>
Date: Mon, 21 Dec 2020 17:27:40 +0000 (+0100)
Subject: Add a new ParaView patch to fix the way Python is detected - conflict with native... 
X-Git-Tag: V9_7_0~180
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2844ec68bfd11b609c40721e4195caa06abdb3a1;p=tools%2Fsat_salome.git

Add a new ParaView patch to fix the way Python is detected - conflict with native sip (cf. bos 18911)
---

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index eec6a1a..6a9fb14 100644
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -232,12 +232,13 @@ __overwrite__ :
   {
     # Adapt Paraview CMake files to be compliant with recent distributions
     __condition__ : "VARS.dist in ['FD30', 'FD32', 'CO8']"
-    'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0010-ParaViewClient.patch',
-                                                 'paraview.0004-ParaView_hdf5.patch',
+    'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0004-ParaView_hdf5.patch',
                                                  'paraview.0005-ParaView_find_cgns.patch',
                                                  'paraview.0006-ParaView_find_libxml2.patch',
                                                  'paraview.0007-ParaView_find_freetype.patch',
                                                  'paraview.0009-ParaView_volume_mapper.patch',
+                                                 'paraview.0010-ParaViewClient.patch',
+                                                 'paraview.0010-ParaView_find_python.patch',
                                                  'pv_coincident.patch'
                                                 ]
   }
diff --git a/products/GUI.pyconf b/products/GUI.pyconf
index 641279b..db4b15c 100644
--- a/products/GUI.pyconf
+++ b/products/GUI.pyconf
@@ -2,7 +2,7 @@ default :
 {
     name : "GUI"
     build_source : "cmake"
-    cmake_options : "-DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DSIP_INCLUDE_DIR=${SIP_ROOT_DIR}"
+    cmake_options : "-DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
     get_source : "git"
     git_info:
     {
diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf
index 8e68265..94e4368 100755
--- a/products/ParaView.pyconf
+++ b/products/ParaView.pyconf
@@ -40,6 +40,7 @@ version_5_8_0 :
                'paraview.0006-ParaView_find_libxml2.patch',
                'paraview.0007-ParaView_find_freetype.patch',
                'paraview.0009-ParaView_volume_mapper.patch',
+               'paraview.0010-ParaView_find_python.patch',
                'pv_coincident.patch'
               ]
 }