X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=applications%2FSALOME-master.pyconf;h=b2bb7ff435411da21bd14f5769133f8fbda5132e;hb=825eefff6c61f3cf05d7216aade29407f2a25147;hp=e163b408b824a531cf28f6c6ecdbdd264ea65812;hpb=3408bccd52f943363f089417b5ce467aec6d866c;p=tools%2Fsat_salome.git

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index e163b40..b2bb7ff 100644
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -17,6 +17,8 @@ APPLICATION :
         {
            CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
            RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED"
+           SALOME_USE_64BIT_IDS : '1'
+           VTK_SMP_IMPLEMENTATION_TYPE : sequential # OpenMP # choose among: sequential / OpenMP / TBB switches
         }
         launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"}
         SALOME_trace : "local" # local/file:.../with_logger
@@ -28,7 +30,7 @@ APPLICATION :
         alabaster : '0.7.6'
         Babel : '2.7.0'
         boost : '1.58.0'
-        CAS : 'CR740-SALOME-PATCH'
+        CAS : 'V7_5_0'
         certifi : '2018.8.24'
         cgns : '3.3.1'
         chardet : '3.0.4'
@@ -58,9 +60,9 @@ APPLICATION :
         llvm : '8.0.1-clang'
         markupsafe : '0.23'
         matplotlib : '2.2.2'
-        medfile : '4.1.0'
+        medfile : {section: 'default_Autotools', tag: '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'
@@ -69,13 +71,14 @@ APPLICATION :
         omniORBpy : '4.2.2'
         opencv : '3.2.0'
         openssl : "native"
+        #openturns: '1.16'
         ospray : '1.8.4'
         packaging : '17.1'
         ParaView : '5.8.0'
         petsc : '3.14.0'
         Pillow : '7.1.1'
         planegcs : '0.18-3cb6890'
-        pockets : '0.6.2'
+        psutil : '5.7.2'
         Pygments : '2.0.2'
         pyparsing : '2.0.3'
         PyQt : '5.9'
@@ -86,6 +89,7 @@ APPLICATION :
         qt : '5.9.1'
         qwt : '6.1.2'
         requests : '2.19.1'
+        root: '6.22.02'
         scipy : '0.19.1'
         scotch : '6.0.4'
         setuptools : '38.4.0'
@@ -93,24 +97,24 @@ APPLICATION :
         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'
         tk : '8.6.0'
         urllib3 : '1.23'
-
+        #URANIE : '4.5.0'
         # SALOME MODULES :
         'CONFIGURATION'
         'SALOME'
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : {tag :'V2_4_3'}
-        'KERNEL'
+        'LIBBATCH' : {tag : 'V2_4_4'}
+        'KERNEL' : {tag : 'occ/psutil'}
         'MEDCOUPLING'
         'GUI'
         'GEOM'
@@ -143,6 +147,7 @@ APPLICATION :
         'PY2CPP' : {tag: 'v2.0'}
         'ADAO'
         'ADAO_INTERFACE'
+        'PARAVISADDONS'
         'CEATESTBASE' : {tag: 'SalomeV9'}
     }
     profile :
@@ -199,6 +204,13 @@ __overwrite__ :
     'PRODUCTS.qt.version_5_9_1.patches' : ['qt-5.9.1-UB20-FD32-socketcanbackend.patch']
   }
 
+  {
+    # Build Fedora 30 with less permissive compilation flags (see spns #18962)
+    __condition__ : "VARS.dist in ['FD30']"
+    'PRODUCTS.LIBBATCH.default.cmake_options' : "-DLIBBATCH_DEBUG_WARNINGS=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
+    'PRODUCTS.CONFIGURATION.default.patches' : ['CONFIGURATION-SALOME-DEBUG-WARNINGS.patch']
+  }
+
   {
     __condition__ : "VARS.dist in ['FD32']"
     'APPLICATION.products.scipy' : '1.5.2' # gcc https://github.com/scipy/scipy/issues/11611 - either patch numpy to include -fallow-argument-mismatch or move to that version
@@ -206,25 +218,44 @@ __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',
+  }
+
+  {
+    __condition__ : "VARS.dist in ['CO7']"
+    'APPLICATION.products.tbb' : '2019_U8'
+  }
+
+  {
+    __condition__ : "VARS.dist in ['CO7'] and APPLICATION.environ.build.VTK_SMP_IMPLEMENTATION_TYPE == 'OpenMP'"
+    'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0003-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'
+                                                 'paraview.0011-vtkSMPSelection.patch',
+                                                 'pv_coincident.patch',
+                                                 'paraview-0012-LATA_64BITS_IDS.patch'
                                                 ]
   }
 
   {
-    __condition__ : "VARS.dist in ['CO8']"
-    'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0010-ParaViewClient.patch',
-                                                 'paraview.0004-ParaView_hdf5.patch',
+    __condition__ : "VARS.dist in ['CO7'] and APPLICATION.environ.build.VTK_SMP_IMPLEMENTATION_TYPE == 'TBB'"
+    'APPLICATION.products.tbb' : '2019_U8'
+  }
+
+  {
+    # Adapt Paraview CMake files to be compliant with recent distributions
+    __condition__ : "VARS.dist in ['FD30', 'FD32', 'CO8']"
+    'PRODUCTS.ParaView.version_5_8_0.patches' : ['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'
+                                                 'paraview.0010-ParaViewClient.patch',
+                                                 'paraview.0010-ParaView_find_python.patch',
+                                                 'pv_coincident.patch',
+                                                 'paraview-0012-LATA_64BITS_IDS.patch'
                                                 ]
   }
 ]