SALOME 9.7.0 MPI - fix souci compilation si devtoolset

[tools/sat_salome.git] / applications / SALOME-master-int32.pyconf

diff --git a/applications/SALOME-master-int32.pyconf b/applications/SALOME-master-int32.pyconf
index a3a196b4204e8d7da16e775727988fd657c898c2..bab16cdd0383fbf21b6040ce8774904863b4752f 100644 (file)
--- a/applications/SALOME-master-int32.pyconf
+++ b/applications/SALOME-master-int32.pyconf
@@ -28,7 +28,7 @@ APPLICATION :
         alabaster : '0.7.6'
         Babel : '2.7.0'
         boost : '1.58.0'
-        CAS : 'CR740-SALOME-PATCH'
+        CAS : {tag: 'CR750-SALOME-PATCH', section: 'version_V7_5_0'}
         certifi : '2018.8.24'
         cgns : '3.3.1'
         chardet : '3.0.4'
@@ -60,22 +60,21 @@ APPLICATION :
         matplotlib : '2.2.2'
         medfile : '4.1.0'
         mesa : '19.0.8'
-        MeshGems : '2.11-5'
+        MeshGems : '2.12-1'
         metis : '5.1.0'
         netgen : '5.3.1_with_CAS_7.2'
-        nlopt : '2.4.2'
-        numpy : '1.15.1'
+        nlopt : '2.5.0'
+        numpy : '1.16.4'
         omniORB : '4.2.2'
         omniORBpy : '4.2.2'
         opencv : '3.2.0'
         openssl : "native"
         ospray : '1.8.4'
         packaging : '17.1'
-        ParaView : '5.8.0'
-        petsc : '3.14.0'
+        ParaView : {tag : '5.8.0', section : 'version_5_8_0_int32'}
+        petsc : {tag : '3.15.0', section: 'version_3_15_0'}
         Pillow : '7.1.1'
         planegcs : '0.18-3cb6890'
-        pockets : '0.6.2'
         Pygments : '2.0.2'
         pyparsing : '2.0.3'
         PyQt : '5.9'
@@ -86,17 +85,17 @@ APPLICATION :
         qt : '5.9.1'
         qwt : '6.1.2'
         requests : '2.19.1'
-        scipy : '0.19.1'
+        scipy : '1.4.1'
         scotch : '6.0.4'
         setuptools : '38.4.0'
         sip : '4.19.3'
         six : '1.10.0'
         snowballstemmer : '1.2.1'
         Sphinx : '1.7.6'
-        sphinxcontrib_napoleon : '0.6.1'
         sphinxcontrib_websupport : '1.1.0'
         sphinx_rtd_theme : '0.4.3'
         sphinxintl: '0.9.10'
+        StaticMeshPlugin: '5.8.0'
         swig : '3.0.12'
         tbb : 'native'
         tcl : '8.6.0'
@@ -109,9 +108,9 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : {tag :'V2_4_3'}
+        'LIBBATCH' : {tag :'V2_4_4'}
         'KERNEL'
-        'MEDCOUPLING'
+        'MEDCOUPLING': {section: 'default_32BIT_IDS'}
         'GUI'
         'GEOM'
         'SMESH'
@@ -143,6 +142,7 @@ APPLICATION :
         'PY2CPP' : {tag: 'v2.0'}
         'ADAO'
         'ADAO_INTERFACE'
+        'PARAVISADDONS'
         'CEATESTBASE' : {tag: 'SalomeV9'}
     }
     profile :
@@ -206,19 +206,12 @@ __overwrite__ :
     'PRODUCTS.llvm.version_8_0_1_clang.patches' : ['llvm-8.0.1-clang-FD32.patch']
     'PRODUCTS.qt.version_5_9_1.patches' : ['qt-5.9.1-UB20-FD32-socketcanbackend.patch', 'qt-5.9.1-mapbox-FD32.patch']
     'PRODUCTS.mesa.version_19_0_8.patches' : ['mesa-19.0.8-debug_symbol.patch']
-    'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0010-ParaViewClient.patch',
-                                                 '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',
-                                                 'pv_coincident.patch'
-                                                ]
   }
 
   {
-    __condition__ : "VARS.dist in ['CO8']"
-    'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0010-ParaViewClient.patch',
+    # Adapt Paraview CMake files to be compliant with recent distributions
+    __condition__ : "VARS.dist in ['FD30', 'FD32', 'CO8']"
+    'PRODUCTS.ParaView.version_5_8_0_int32.patches' : ['paraview.0010-ParaViewClient.patch',
                                                  'paraview.0004-ParaView_hdf5.patch',
                                                  'paraview.0005-ParaView_find_cgns.patch',
                                                  'paraview.0006-ParaView_find_libxml2.patch',