From 9a4bd78563ba4016d7ce0cf593191ba33846f6ff Mon Sep 17 00:00:00 2001 From: Nicolas OTTON Date: Mon, 1 Aug 2022 15:17:44 +0200 Subject: [PATCH] passage de MeshGems en 2.13 en attendant les licences pour 2.14 --- applications/SALOME-master-MPI.pyconf | 5 +++++ applications/SALOME-master-native.pyconf | 4 ++++ applications/SALOME-master-windows.pyconf | 4 ++++ applications/SALOME-master.pyconf | 4 ++++ 4 files changed, 17 insertions(+) diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf index 3fc83aa..1d64f3d 100644 --- a/applications/SALOME-master-MPI.pyconf +++ b/applications/SALOME-master-MPI.pyconf @@ -221,4 +221,9 @@ __overwrite__ : __condition__ : "VARS.dist not in ['DB08','DB09', 'FD30']" 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr'] } + + { + __condition__ : "VARS.dist not in ['DB09','DB10', 'DB10']" + 'APPLICATION.products.MeshGems' : {tag : '2.14-4', hpc : 'yes'} + } ] diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index df8fc04..3ecfce9 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -260,4 +260,8 @@ __overwrite__ : 'APPLICATION.products.root' : {tag:'6.22.02', base: 'no', section: 'version_6_22_02_FD34' } 'APPLICATION.products.gdal' : {tag:'2.4.0', base: 'no', section: 'version_2_4_0_FD34' } # spns #29324 } + { + __condition__ : "VARS.dist not in ['DB09','DB10', 'DB10']" + 'APPLICATION.products.MeshGems' : '2.13-1' + } ] diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index 0b995c4..12164f8 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -211,4 +211,8 @@ __overwrite__ : 'APPLICATION.products.ParaView' : {tag: '5.9.0', base: 'no', section : 'version_5_9_0_win_dbg' } 'APPLICATION.products.zlib' : {tag: '1.2.5', base: 'no', section : 'version_1_2_5_win_dbg' } } + { + __condition__ : "VARS.dist not in ['DB09','DB10', 'DB10']" + 'APPLICATION.products.MeshGems' : '2.13-1' + } ] diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index 329a1ac..dffd5f8 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -241,4 +241,8 @@ __overwrite__ : 'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr'] 'APPLICATION.products.gdal': {tag:'2.4.0', base: 'no', section: 'version_2_4_0_UB20_04'} # spns #29324 } + { + __condition__ : "VARS.dist not in ['DB09','DB10', 'DB10']" + 'APPLICATION.products.MeshGems' : '2.13-1' + } ] -- 2.30.2