From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Mon, 31 Jan 2022 15:56:48 +0000 (+0100)
Subject: rm_products cannot be used twice
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fspns%2F24419;p=tools%2Fsat_salome.git

rm_products cannot be used twice
---

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 99f3783..7abca22 100644
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -196,15 +196,12 @@ __overwrite__ :
         __condition__ : "VARS.dist in ['FD32']"
         # https://github.com/scipy/scipy/issues/11611
         'APPLICATION.products.scipy' : '1.5.2'
+        'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr', 'openmpi', 'mpi4py']
     }
     {
         __condition__ : "VARS.dist in ['FD30']"
-        # https://github.com/scipy/scipy/issues/11611
         'APPLICATION.products.gcc' : '9.3.0'
-    }
-    {
-        __condition__ : "VARS.dist not in ['DB08','DB09', 'FD30']"
-        'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+        'APPLICATION.rm_products' : ['openmpi', 'mpi4py']
     }
     {
         __condition__ : "VARS.dist in ['DB09']"
@@ -213,8 +210,15 @@ __overwrite__ :
         'APPLICATION.products.MEDCOUPLING' : {tag:'master', base: 'no',  section: 'default_MPI',       hpc: 'yes'}
     }
     {
-        __condition__ : "VARS.dist not in ['DB09']"
-        'APPLICATION.rm_products' : ['openmpi', 'mpi4py']
+        __condition__ : "VARS.dist in ['CO7']"
+        'APPLICATION.rm_products' : ['openmpi', 'mpi4py', 'gcc', 'gmp', 'mpc', 'mpfr']
+    }
+    {
+        __condition__ : "VARS.dist in ['CO8']"
+        'APPLICATION.rm_products' : ['openmpi', 'mpi4py', 'gcc', 'gmp', 'mpc', 'mpfr']
+    }
+    {
+        __condition__ : "VARS.dist in ['DB10']"
+        'APPLICATION.rm_products' : ['openmpi', 'mpi4py', 'gcc', 'gmp', 'mpc', 'mpfr']
     }
-
 ]
diff --git a/products/GUI.pyconf b/products/GUI.pyconf
index a760b64..ba7e7ac 100644
--- a/products/GUI.pyconf
+++ b/products/GUI.pyconf
@@ -30,7 +30,7 @@ default :
               "libxml2",
               "sphinxintl"
            ]
-    opt_depend : ["sphinx_rtd_theme"]
+    opt_depend : ["sphinx_rtd_theme", "openmpi"]
     build_depend : ["cmake", "swig", "doxygen", "cppunit"]
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
@@ -168,7 +168,7 @@ version_7_8_0_to_8_4_0 :
 {
     name : "GUI"
     build_source : "cmake"
-    cmake_options : "-DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
+    cmake_options : "-DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig "
     get_source : "git"
     git_info:
     {
diff --git a/products/compil_scripts/ParaView-5.9.0.sh b/products/compil_scripts/ParaView-5.9.0.sh
index f782c2d..bbea36a 100755
--- a/products/compil_scripts/ParaView-5.9.0.sh
+++ b/products/compil_scripts/ParaView-5.9.0.sh
@@ -118,6 +118,7 @@ then
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_USE_MPI:BOOL=ON"
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DMPI_C_FOUND=${MPI_ROOT_DIR}/lib/libmpi.so"
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP -DVTKm_ENABLE_OPENMP=ON"
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_ENABLE_VTK_FiltersParallelMPI=YES"
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_ENABLE_VTK_ParallelMPI=YES"