From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Wed, 27 Oct 2021 12:24:52 +0000 (+0200)
Subject: Merge branch 'master' into spns/24377
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a9d40ebfe6910857bd08d8d084b08a04065b0ef8;p=tools%2Fsat_salome.git

Merge branch 'master' into spns/24377
---

a9d40ebfe6910857bd08d8d084b08a04065b0ef8
diff --cc applications/SALOME-master-MPI.pyconf
index 7e74eee,024b278..0509e5d
--- a/applications/SALOME-master-MPI.pyconf
+++ b/applications/SALOME-master-MPI.pyconf
@@@ -46,10 -45,13 +46,14 @@@ APPLICATION 
          doxygen : '1.8.14'
          eigen : '3.3.4'
          embree : '3.12.2'
 +        FMILibrary : '2.0.3'
          freeimage : '3.16.0'
          freetype : '2.9.1'
-         gmsh : '4.1.4'
+         gcc  :  '8.5.0'
+         mpc : 'native'
+         gmp : 'native'
+         mpfr : 'native'
+         gmsh : '4.8.4'
          graphviz : '2.38.0'
          hdf5 : {tag : '1.10.3', hpc : 'yes'}
          idna : '2.7'
diff --cc applications/SALOME-master.pyconf
index fe52096,2b93760..c4980e4
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@@ -46,10 -45,13 +46,14 @@@ APPLICATION 
          doxygen : '1.8.14'
          eigen : '3.3.4'
          embree : '3.12.2'
 +        FMILibrary : '2.0.3'
          freeimage : '3.16.0'
          freetype : '2.9.1'
-         gmsh : '4.1.4'
+         gcc  :  '8.5.0'
+         mpc : 'native'
+         gmp : 'native'
+         mpfr : 'native'
+         gmsh : '4.8.4'
          graphviz : '2.38.0'
          hdf5 : '1.10.3'
          idna : '2.7'