X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=applications%2FSALOME-master.pyconf;h=eec6a1a2ddb67c64f3d8eda17bd42cbd709358eb;hb=00334f9aa922dfc1426ec5c7038c081f159661b9;hp=ba70739923856c21dd927b36747712d125cbc690;hpb=40e7aa1bf6fd61b32dbcc6634b02c52331987374;p=tools%2Fsat_salome.git

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index ba70739..eec6a1a 100644
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -111,9 +111,9 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH'
+        'LIBBATCH' : {tag : 'V2_4_4'}
         'KERNEL'
-        'MEDCOUPLING' : {tag : 'master', section: 'default_int64'} # this will trigger other modules as int64
+        'MEDCOUPLING'
         'GUI'
         'GEOM'
         'SMESH'
@@ -132,7 +132,7 @@ APPLICATION :
         'JOBMANAGER'
         'YACS'
         'YACSGEN'
-#        'SOLVERLAB'
+        'SOLVERLAB'
         'DOCUMENTATION'
         'SAMPLES'
         'COMPONENT'
@@ -145,6 +145,7 @@ APPLICATION :
         'PY2CPP' : {tag: 'v2.0'}
         'ADAO'
         'ADAO_INTERFACE'
+        'PARAVISADDONS' : {tag: 'spns/20440'}
         'CEATESTBASE' : {tag: 'SalomeV9'}
     }
     profile :
@@ -208,14 +209,6 @@ __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'
-                                                ]
   }
 
   {
@@ -237,7 +230,8 @@ __overwrite__ :
   }
 
   {
-    __condition__ : "VARS.dist in ['CO8']"
+    # 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.0010-ParaViewClient.patch',
                                                  'paraview.0004-ParaView_hdf5.patch',
                                                  'paraview.0005-ParaView_find_cgns.patch',