aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2018-09-10 12:11:46 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2018-09-10 21:02:18 +0300
commit39d87269b31e64cfdfb32706236ca84329dbfca4 (patch)
treefa9addc0e40ce79a3460ae21afe81d0bac5339c6
parent593de3747456b1c77d5227b463b0c45e964f222c (diff)
downloadmeson-39d87269b31e64cfdfb32706236ca84329dbfca4.zip
meson-39d87269b31e64cfdfb32706236ca84329dbfca4.tar.gz
meson-39d87269b31e64cfdfb32706236ca84329dbfca4.tar.bz2
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.
-rw-r--r--mesonbuild/dependencies/dev.py6
-rw-r--r--mesonbuild/dependencies/misc.py2
-rw-r--r--mesonbuild/dependencies/platform.py3
-rw-r--r--mesonbuild/dependencies/ui.py5
4 files changed, 16 insertions, 0 deletions
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'