From 48d70d15f55abcdf6b40082647b29a51baaf6705 Mon Sep 17 00:00:00 2001 From: crouzet Date: Thu, 1 Sep 2022 12:26:05 +0200 Subject: [PATCH] ajout cmake au lanceur runtime, changement de l'environ pour CONFIGURATION --- products/CONFIGURATION.pyconf | 5 +---- products/cmake.pyconf | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/products/CONFIGURATION.pyconf b/products/CONFIGURATION.pyconf index 69c917e..eaf4a8d 100755 --- a/products/CONFIGURATION.pyconf +++ b/products/CONFIGURATION.pyconf @@ -7,10 +7,6 @@ default : repo : $PROJECTS.projects.salome.git_info.default_git_server + "tools/configuration.git" repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "configuration.git" } - environ : - { - build : {CONFIGURATION_ROOT_DIR : $source_dir} - } depend : [ ] source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name properties : @@ -18,6 +14,7 @@ default : compilation : "no" configure_dependency : "yes" # the source of this module is required for the configuration of salome is_SALOME_module : "yes" + sources_in_package : "yes" } patches : [] diff --git a/products/cmake.pyconf b/products/cmake.pyconf index a14208d..ad02719 100644 --- a/products/cmake.pyconf +++ b/products/cmake.pyconf @@ -24,7 +24,7 @@ default : properties: { incremental : "yes" - compile_time : "yes" + compile_and_runtime : "yes" } } -- 2.39.2