From 11aeceea55b09f097497013bdc8f199ac201976e Mon Sep 17 00:00:00 2001 From: crouzet Date: Wed, 29 Nov 2017 15:02:24 +0100 Subject: [PATCH] little corrections for fixed cpp components --- commands/generate.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/commands/generate.py b/commands/generate.py index c60a22b..0fd1bf9 100644 --- a/commands/generate.py +++ b/commands/generate.py @@ -49,8 +49,15 @@ def generate_component_list(config, product_info, context, logger): return res def generate_component(config, compo, product_info, context, header, logger): - hxxfile = compo + ".hxx" - cpplib = "lib" + compo + "CXX.so" +# get from config include file name and librairy name, or take default value + if "hxxfile" in product_info: + hxxfile = product_info.hxxfile + else: + hxxfile = compo + ".hxx" + if "cpplib" in product_info: + cpplib = product_info.cpplib + else: + cpplib = "lib" + compo + "CXX.so" cpp_path = product_info.install_dir logger.write("%s\n" % header, 4, False) @@ -135,7 +142,7 @@ def generate_component(config, compo, product_info, context, header, logger): if src.product.product_has_salome_gui(product_info): # get files to build a template GUI - gui_files = salome_compo.getGUIfilesTemplate() + gui_files = salome_compo.getGUIfilesTemplate(compo) else: gui_files = None -- 2.39.2