From 648f2fac15a3d826b099cf39b5318534673f7e16 Mon Sep 17 00:00:00 2001 From: nghodban Date: Wed, 6 Jan 2021 18:26:31 +0100 Subject: [PATCH] =?utf8?q?spns=20#20557=20Construction=20dynamique=20de=20?= =?utf8?q?l'ex=C3=A9cutable=20Homard?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- applications/SALOME-master.pyconf | 3 +-- products/HOMARD.pyconf | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index f0aa747..ebce4c0 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -49,7 +49,6 @@ APPLICATION : gmsh : '4.1.4' graphviz : '2.38.0' hdf5 : '1.10.3' - homard_bin : '11.12_hdf51103med410' idna : '2.7' imagesize : '1.0.0' ispc : '1.9.2' @@ -126,7 +125,7 @@ APPLICATION : 'GMSHPLUGIN' 'HEXABLOCK' 'HEXABLOCKPLUGIN' - 'HOMARD' + 'HOMARD' : {tag : 'gn/evol_01'} 'FIELDS' 'PARAVIS' 'JOBMANAGER' diff --git a/products/HOMARD.pyconf b/products/HOMARD.pyconf index 21922eb..1767a50 100644 --- a/products/HOMARD.pyconf +++ b/products/HOMARD.pyconf @@ -12,18 +12,26 @@ default : environ : { SalomeAppConfig_ : $install_dir + $VARS.sep + "share" + $VARS.sep + "salome" + $VARS.sep + "resources" + $VARS.sep + "homard" + HOMARD_REP_EXE : $install_dir + $VARS.sep + "bin" + $VARS.sep + "salome" + HOMARD_EXE : "homard.out" } - depend : [ - "SMESH", - "homard_bin" - ] + depend : [ "SMESH"] source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name properties: { has_salome_gui : "yes" is_SALOME_module : "yes" + incremental : "yes" has_unit_tests } } +version_8_5_0_to_V9_6_0 : +{ + environ : + { + SalomeAppConfig_ : $install_dir + $VARS.sep + "share" + $VARS.sep + "salome" + $VARS.sep + "resources" + $VARS.sep + "homard" + } + depend : ["SMESH","homard_bin"] +} -- 2.39.2