ajout cmake au lanceur runtime, changement de l'environ pour CONFIGURATION

diff --git a/products/CONFIGURATION.pyconf b/products/CONFIGURATION.pyconf
index 69c917e1eb287697134a058abb99d1fa5af6ba2b..eaf4a8d5b86e4c6340e801dbdd2159fe0fbd283b 100755 (executable)
--- 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 a14208d6b838b29b33c2c11a714424150d708068..ad02719886250dcbe711ef5dbcace9375cade91f 100644 (file)
--- a/products/cmake.pyconf
+++ b/products/cmake.pyconf
@@ -24,7 +24,7 @@ default :
     properties:
     {
       incremental : "yes"
-      compile_time : "yes"
+      compile_and_runtime : "yes"
     }
 }