From 60f4a59e2a367d3256c11e02eb5688bd03d9bdac Mon Sep 17 00:00:00 2001 From: crouzet Date: Fri, 22 Oct 2021 14:20:50 +0200 Subject: [PATCH] utilisation de env_build, car pas besoin de licence au build --- products/env_scripts/MeshGems.py | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/products/env_scripts/MeshGems.py b/products/env_scripts/MeshGems.py index f5d4bc4..76a4f54 100644 --- a/products/env_scripts/MeshGems.py +++ b/products/env_scripts/MeshGems.py @@ -41,21 +41,12 @@ def set_DASSAULT_license(env, version): license_file_name=license_file_prefix + '-' + version + '-' + linux_dist + '.so' if not os.path.exists(license_file_name): - print("WARNING : DASSAULT license file %s not found!" % license_file_name) + print("\nWARNING : DASSAULT license file %s not found!" % license_file_name) env.set('SALOME_MG_KEYGEN_LIB_PATH', license_file_name) return -def set_env(env, prereq_dir, version): - env.add_comment("Here you can define your license parameters for MeshGems") - if LooseVersion(version) > LooseVersion('2.12-1'): - set_DASSAULT_license(env,version) - else: - env.add_comment("DISTENE license") - if not env.forBuild: - # we don't need licence keys at compile time - set_distene_licence(env) - +def set_env_build(env, prereq_dir, version): env.set('MESHGEMSHOME', prereq_dir) env.set('MESHGEMS_ROOT_DIR', prereq_dir) # update for cmake @@ -68,5 +59,17 @@ def set_env(env, prereq_dir, version): env.prepend('PATH', os.path.join(prereq_dir, 'bin', libdir)) env.prepend('LD_LIBRARY_PATH', os.path.join(prereq_dir, 'lib', libdir)) +def set_env(env, prereq_dir, version): + env.add_comment("Here you can define your license parameters for MeshGems") + if LooseVersion(version) > LooseVersion('2.12-1'): + set_DASSAULT_license(env,version) + else: + env.add_comment("DISTENE license") + if not env.forBuild: + # we don't need licence keys at compile time + set_distene_licence(env) + set_env_build(env, prereq_dir, version) + + def set_nativ_env(env): pass -- 2.39.2