X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=applications%2FSALOME-master.pyconf;h=a2b90c97d6bcf08ad931e2525603fd52f201e274;hb=90e0be08a47eb582d2ac663e13f86adac2036bd1;hp=e163b408b824a531cf28f6c6ecdbdd264ea65812;hpb=d61c045738d17e2be5cf9ffb85b4e01829a584e4;p=tools%2Fsat_salome.git

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index e163b40..a2b90c9 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
@@ -58,7 +60,7 @@ 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'
         metis : '5.1.0'
@@ -109,9 +111,9 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : {tag :'V2_4_3'}
+        'LIBBATCH'
         'KERNEL'
-        'MEDCOUPLING'
+        'MEDCOUPLING' : {tag : 'master', section: 'default_int64'} # this will trigger other modules as int64
         'GUI'
         'GEOM'
         'SMESH'
@@ -216,6 +218,24 @@ __overwrite__ :
                                                 ]
   }
 
+  {
+    __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',
+                                                 'paraview.0011-vtkSMPSelection.patch',
+                                                 'pv_coincident.patch'
+                                                ]
+  }
+
+  {
+    __condition__ : "VARS.dist in ['CO7'] and APPLICATION.environ.build.VTK_SMP_IMPLEMENTATION_TYPE == 'TBB'"
+    'APPLICATION.products.tbb' : '4.4'
+  }
+
   {
     __condition__ : "VARS.dist in ['CO8']"
     'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0010-ParaViewClient.patch',