aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies/detect.py
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2021-10-28 15:06:27 -0400
committerEli Schwartz <eschwartz93@gmail.com>2023-06-01 18:47:03 -0400
commit26da7ec9f535205f9a6b102380087a1383c092c3 (patch)
treed3b24c6f737b1c063af390d3d05ff9ae917c89ea /mesonbuild/dependencies/detect.py
parent1a9f20d44a3c88882e5744d6179926f3f179cc8d (diff)
downloadmeson-26da7ec9f535205f9a6b102380087a1383c092c3.zip
meson-26da7ec9f535205f9a6b102380087a1383c092c3.tar.gz
meson-26da7ec9f535205f9a6b102380087a1383c092c3.tar.bz2
python: Use detect.find_external_dependency() for log consistency
py.find_installation().dependency() was not logging whether it is found or not. Use find_external_dependency() for consistency.
Diffstat (limited to 'mesonbuild/dependencies/detect.py')
-rw-r--r--mesonbuild/dependencies/detect.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/detect.py b/mesonbuild/dependencies/detect.py
index 4c7a477..b5c9251 100644
--- a/mesonbuild/dependencies/detect.py
+++ b/mesonbuild/dependencies/detect.py
@@ -80,7 +80,7 @@ display_name_map = {
'wxwidgets': 'WxWidgets',
}
-def find_external_dependency(name: str, env: 'Environment', kwargs: T.Dict[str, object]) -> T.Union['ExternalDependency', NotFoundDependency]:
+def find_external_dependency(name: str, env: 'Environment', kwargs: T.Dict[str, object], candidates: T.Optional[T.List['DependencyGenerator']] = None) -> T.Union['ExternalDependency', NotFoundDependency]:
assert name
required = kwargs.get('required', True)
if not isinstance(required, bool):
@@ -101,7 +101,8 @@ def find_external_dependency(name: str, env: 'Environment', kwargs: T.Dict[str,
type_text = PerMachine('Build-time', 'Run-time')[for_machine] + ' dependency'
# build a list of dependency methods to try
- candidates = _build_external_dependency_list(name, env, for_machine, kwargs)
+ if candidates is None:
+ candidates = _build_external_dependency_list(name, env, for_machine, kwargs)
pkg_exc: T.List[DependencyException] = []
pkgdep: T.List[ExternalDependency] = []