From a4b1c0e3ae6fccc3fe5ab4dd49e81c38741e6971 Mon Sep 17 00:00:00 2001 From: Guytri KASTANE Date: Mon, 12 Feb 2024 15:03:28 +0100 Subject: [PATCH] spns #40729: Add sections for MeshGems-2024.1 --- products/MeshGems.pyconf | 10 ++++++++++ products/env_scripts/MeshGems.py | 7 +++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/products/MeshGems.pyconf b/products/MeshGems.pyconf index ae3df52..432e501 100644 --- a/products/MeshGems.pyconf +++ b/products/MeshGems.pyconf @@ -35,6 +35,16 @@ default_win : } } +version_2024_1 : +{ + properties : + { + is_distene : "no" + licence : "libSalomeMeshGemsKeyGenerator" + incremental : "yes" + } +} + version_2_15_1 : { properties : diff --git a/products/env_scripts/MeshGems.py b/products/env_scripts/MeshGems.py index 76e0731..6f55b69 100644 --- a/products/env_scripts/MeshGems.py +++ b/products/env_scripts/MeshGems.py @@ -69,8 +69,11 @@ def set_env(env, prereq_dir, version): # we don't need licence keys at compile time set_distene_licence(env) set_env_build(env, prereq_dir, version) - # - M,m,p=map(str, version.replace('-','.').split('.')) + try: + M,m,p=map(str, version.replace('-','.').split('.')) + except: + M,m=map(str, version.replace('-','.').split('.')) + p="0" env.set('MESHGEMS_VERSION', version) env.set('MESHGEMS_VERSION_MAJOR',M) env.set('MESHGEMS_VERSION_MINOR',m) -- 2.39.2