Add a new ParaView patch to fix the way Python is detected - conflict with native...

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index eec6a1a2ddb67c64f3d8eda17bd42cbd709358eb..6a9fb14f686fd6a41b2e39da449fcd9f05ccccf4 100644 (file)
--- 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 641279bd326fe44b7bb3ba57cd723ab0d3132f70..db4b15c8327f8497f6a2cbc0551c03a06f38a6a9 100644 (file)
--- 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 8e682651d80b6f3a0bbf220f3257877b50a4db8b..94e4368a28ef94810d6b2764ae27c360c3f4e8aa 100755 (executable)
--- 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'
               ]
 }