[jhbuild] Declare make or ninja dependency for cmake but not both



commit f5c2711e13bf51de1f0ee91de7b53077a48b3a97
Author: Damien Caliste <dcaliste free fr>
Date:   Thu Jan 6 12:34:31 2022 +0100

    Declare make or ninja dependency for cmake but not both

 jhbuild/modtypes/cmake.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/jhbuild/modtypes/cmake.py b/jhbuild/modtypes/cmake.py
index df3852dc..b8538a07 100644
--- a/jhbuild/modtypes/cmake.py
+++ b/jhbuild/modtypes/cmake.py
@@ -163,12 +163,6 @@ class CMakeModule(MakeModule, NinjaModule, DownloadableModule):
 def parse_cmake(node, config, uri, repositories, default_repo):
     instance = CMakeModule.parse_from_xml(node, config, uri, repositories, default_repo)
 
-    instance.dependencies += [
-        'cmake',
-        instance.get_ninjacmd(config),
-        instance.get_makecmd(config),
-    ]
-
     instance.cmakeargs = collect_args(instance, node, 'cmakeargs')
     instance.makeargs = collect_args(instance, node, 'makeargs')
     instance.ninjaargs = collect_args(instance, node, 'ninjaargs')
@@ -191,6 +185,13 @@ def parse_cmake(node, config, uri, repositories, default_repo):
             instance.use_ninja = False
     if node.hasAttribute('cmakedir'):
         instance.cmakedir = node.getAttribute('cmakedir')
+
+    instance.dependencies.append('cmake')
+    if instance.use_ninja:
+        instance.dependencies.append(instance.get_ninjacmd(config))
+    else:
+        instance.dependencies.append(instance.get_makecmd(config))
+
     return instance
 
 register_module_type('cmake', parse_cmake)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]