From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Wed, 26 Jan 2022 09:26:21 +0000 (+0100)
Subject: move openmpi system dependency in salome_system
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d7ce27df35baffe0975ed974ae1db2664a1c682e;p=tools%2Fsat_salome.git

move openmpi system dependency in salome_system
---

diff --git a/products/openmpi.pyconf b/products/openmpi.pyconf
index 5bd6c6a..a8423f2 100644
--- a/products/openmpi.pyconf
+++ b/products/openmpi.pyconf
@@ -4,13 +4,6 @@ default :
     build_source : "script"
     compil_script :  $name + ".sh"
     get_source : "archive"
-    system_info :
-    {
-        rpm : ["openmpi"]
-        rpm_dev : ["openmpi-devel"]
-        apt : ["libopenmpi2"]
-        apt_dev : ["libopenmpi-dev"]
-    }
     environ :
     {
        env_script : $name + ".py"
diff --git a/products/salome_system.pyconf b/products/salome_system.pyconf
index 3e16ef4..5580283 100644
--- a/products/salome_system.pyconf
+++ b/products/salome_system.pyconf
@@ -40,23 +40,23 @@ default :
         }
         "CO8" :
         {
-            rpm : ["lz4"]
-            rpm_dev : ["perl-interpreter", "qt5-devel"]
+            rpm : ["lz4", "openmpi"]
+            rpm_dev : ["perl-interpreter", "qt5-devel", "openmpi-devel"]
         }
         "FD30" :
         {
-           rpm : ["lz4", "gsl"]
-           rpm_dev : ["perl-interpreter", "qt5-devel", "gsl-devel"]
+           rpm : ["lz4", "gsl", "openmpi"]
+           rpm_dev : ["perl-interpreter", "qt5-devel", "gsl-devel", "openmpi-devel"]
         }
         "FD32" :
         {
-           rpm : ["lz4", "gsl"]
-           rpm_dev : ["perl-interpreter", "qt5-devel", "gsl-devel"]
+           rpm : ["lz4", "gsl", "openmpi"]
+           rpm_dev : ["perl-interpreter", "qt5-devel", "gsl-devel", "openmpi-devel"]
         }
         "FD34" :
         {
-           rpm : ["lz4-libs", "gsl"]
-           rpm_dev : ["lz4-devel", "qt5-qtbase-devel", "gsl-devel"]
+           rpm : ["lz4-libs", "gsl", "openmpi"]
+           rpm_dev : ["lz4-devel", "qt5-qtbase-devel", "gsl-devel", "openmpi-devel"]
         }
         "DB08" :
         {
@@ -72,17 +72,17 @@ default :
         "DB10" :
         {
             apt : ["libopenexr23", "libwebp6", "libgfortran5", "libilmbase23", "libevent-2.1-6", "libpng16-16", "libgcc-8-dev",
-                   "libffi6", "libtinfo6", "libgphoto2-port12", "libglx0", "libopengl0", "libzstd1", "libglvnd0", "libjsoncpp1", "libopenblas-base", "libscotch-6.0"]
+                   "libffi6", "libtinfo6", "libgphoto2-port12", "libglx0", "libopengl0", "libzstd1", "libglvnd0", "libjsoncpp1", "libopenblas-base", "libscotch-6.0", "openmpi-bin"]
             apt_dev : ["libtbb-dev", "cython3", "libfftw3-dev", "libopenblas-dev",
-                       "qttools5-dev", "libqt5svg5-dev", "libqt5x11extras5-dev", "qtxmlpatterns5-dev-tools"]
+                       "qttools5-dev", "libqt5svg5-dev", "libqt5x11extras5-dev", "qtxmlpatterns5-dev-tools", "libopenmpi-dev"]
 
         }
         "DB11" :
         {
             apt : ["libopenexr25", "libwebp6", "libgfortran5", "libilmbase25", "libevent-2.1-7", "libpng16-16", "libgcc-10-dev",
-                   "libffi7", "libtinfo6", "libgphoto2-port12", "libglx0", "libopengl0", "libzstd1", "libglvnd0", "libjsoncpp24"]
+                   "libffi7", "libtinfo6", "libgphoto2-port12", "libglx0", "libopengl0", "libzstd1", "libglvnd0", "libjsoncpp24", "openmpi-bin"]
             apt_dev : ["libtbb-dev", "cython3", "libfftw3-dev", "libopenblas-dev",
-                       "qttools5-dev", "libqt5svg5-dev", "libqt5x11extras5-dev", "qtxmlpatterns5-dev-tools"]
+                       "qttools5-dev", "libqt5svg5-dev", "libqt5x11extras5-dev", "qtxmlpatterns5-dev-tools", "libopenmpi-dev"]
 
         }
         "UB16.04" :
@@ -100,9 +100,9 @@ default :
         "UB20.04" :
         {
             apt : ["libopenexr24", "libwebp6", "libgfortran5", "libilmbase24", "libevent-2.1-7", "libpng16-16", "libgcc-9-dev",
-                   "libffi7", "libtinfo6", "libgphoto2-port12", "libglx0", "libopengl0", "libzstd1", "libglvnd0"]
+                   "libffi7", "libtinfo6", "libgphoto2-port12", "libglx0", "libopengl0", "libzstd1", "libglvnd0", "openmpi-bin"]
             apt_dev : ["libtbb-dev", "cython3", "libfftw3-dev", "libopenblas-dev",
-                       "qttools5-dev", "libqt5svg5-dev", "libqt5x11extras5-dev", "qtxmlpatterns5-dev-tools"]
+                       "qttools5-dev", "libqt5svg5-dev", "libqt5x11extras5-dev", "qtxmlpatterns5-dev-tools", "libopenmpi-dev"]
         }
         
     }