no need of -DMPI_C_FOUND= for GUI compilation

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 5c103d203e7dcc44114b42085d6f07b834980674..f70215f804980b783f4d3aa442fb297fd12a6090 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -226,10 +226,16 @@ __overwrite__ :
     }
     {
         __condition__ : "VARS.dist in ['UB18.04']"
-        'APPLICATION.rm_products' : ['openmpi', 'mpi4py', 'gcc', 'gmp', 'mpc', 'mpfr']
+        'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+        'APPLICATION.products.ParaView'    : {tag:'5.9.0',  base: 'no',  section: 'version_5_9_0_MPI', hpc: 'yes'}
+        'APPLICATION.products.PARAVIS'     : {tag:'master', base: 'no',  section: 'default_MPI',       hpc: 'yes'}
+        'APPLICATION.products.MEDCOUPLING' : {tag:'master', base: 'no',  section: 'default_MPI',       hpc: 'yes'}
     }
     {
         __condition__ : "VARS.dist in ['UB20.04']"
-        'APPLICATION.rm_products' : ['openmpi', 'mpi4py', 'gcc', 'gmp', 'mpc', 'mpfr']
+        'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+        'APPLICATION.products.ParaView'    : {tag:'5.9.0',  base: 'no',  section: 'version_5_9_0_MPI', hpc: 'yes'}
+        'APPLICATION.products.PARAVIS'     : {tag:'master', base: 'no',  section: 'default_MPI',       hpc: 'yes'}
+        'APPLICATION.products.MEDCOUPLING' : {tag:'master', base: 'no',  section: 'default_MPI',       hpc: 'yes'}
     }
 ]

diff --git a/products/GUI.pyconf b/products/GUI.pyconf
index ba7e7ac6b3971e9686b88084fa8809c7bb9ffae3..9307bfe28949b073aeff2048af6d3fdf12262ad3 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 -DMPI_C_FOUND=${MPI_C_FOUND}"
+    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 4b5aeb6a7a193c31fddf2cdbba1b8db0cf8d2300..702346f2ecac6d3a4c740cce38f375480bbd11e4 100755 (executable)
--- a/products/ParaView.pyconf
+++ b/products/ParaView.pyconf
@@ -268,6 +268,7 @@ version_5_9_0_MPI :
                'paraview.0008-ParaView_coincident_rendering.patch',
                'paraview.0011-ParaView_protobuf_crash.patch',
                'paraview.0015-Paraview_VTKM_ioss.patch',
+               'paraview-5.9.0-gcc.11.0.patch',
                'paraview.0017-VTK-openMPI-if-devtoolset.patch',
                'paraview.0018-spns-26351-autoconvert.patch',
                'paraview.0019-spns-26344-VTK-OpenMP.patch'
@@ -288,6 +289,7 @@ version_5_9_0_MPI_int32 :
                'paraview.0008-ParaView_coincident_rendering.patch',
                'paraview.0011-ParaView_protobuf_crash.patch',
                'paraview.0015-Paraview_VTKM_ioss.patch',
+               'paraview-5.9.0-gcc.11.0.patch',
                'paraview.0017-VTK-openMPI-if-devtoolset.patch',
                'paraview.0018-spns-26351-autoconvert.patch',
                'paraview.0019-spns-26344-VTK-OpenMP.patch'