From 39d87269b31e64cfdfb32706236ca84329dbfca4 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Mon, 10 Sep 2018 12:11:46 +0100 Subject: Add missing reporting of some methods tried to find the dependency Make us report 'system' and 'framework' when we tried those methods to locate the dependency. --- mesonbuild/dependencies/dev.py | 6 ++++++ mesonbuild/dependencies/misc.py | 2 ++ mesonbuild/dependencies/platform.py | 3 +++ mesonbuild/dependencies/ui.py | 5 +++++ 4 files changed, 16 insertions(+) diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index bcaf2e8..5ee8b09 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -80,6 +80,9 @@ class GTestDependency(ExternalDependency): else: return 'building self' + def log_tried(self): + return 'system' + @classmethod def _factory(cls, environment, kwargs): methods = cls._process_method_kw(kwargs) @@ -161,6 +164,9 @@ class GMockDependency(ExternalDependency): else: return 'building self' + def log_tried(self): + return 'system' + @classmethod def _factory(cls, environment, kwargs): methods = cls._process_method_kw(kwargs) diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index 65a2803..5164512 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -397,6 +397,8 @@ class Python3Dependency(ExternalDependency): else: return [DependencyMethods.PKGCONFIG] + def log_tried(self): + return 'sysconfig' class PcapDependency(ExternalDependency): diff --git a/mesonbuild/dependencies/platform.py b/mesonbuild/dependencies/platform.py index 0c05156..5b2003f 100644 --- a/mesonbuild/dependencies/platform.py +++ b/mesonbuild/dependencies/platform.py @@ -34,3 +34,6 @@ class AppleFrameworks(ExternalDependency): self.link_args += ['-framework', f] self.is_found = mesonlib.is_osx() + + def log_tried(self): + return 'framework' diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index ae470fb..289d1b4 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -72,6 +72,8 @@ class GLDependency(ExternalDependency): else: return [DependencyMethods.PKGCONFIG] + def log_tried(self): + return 'system' class GnuStepDependency(ConfigToolDependency): @@ -612,3 +614,6 @@ class VulkanDependency(ExternalDependency): @staticmethod def get_methods(): return [DependencyMethods.PKGCONFIG, DependencyMethods.SYSTEM] + + def log_tried(self): + return 'system' -- cgit v1.1