diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2022-02-28 12:04:27 -0500 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2022-04-04 09:17:34 -0400 |
| commit | 7954a4c9cbf8355d8c8ea9b3d98df45d9f96f66e (patch) | |
| tree | 9323406b7184b8e1b02588499fcd0d080b16116a /mesonbuild/modules/__init__.py | |
| parent | 105bbaabdda4656194e97729f67bba9c0f6c8ae1 (diff) | |
| download | meson-7954a4c9cbf8355d8c8ea9b3d98df45d9f96f66e.tar.gz | |
wayland: Also lookup scanner in pkgconfig
This moves generally useful logic from GNOME module's
_get_native_binary() into find_program() implementation. We could decide
later to expose it as public API.
Diffstat (limited to 'mesonbuild/modules/__init__.py')
| -rw-r--r-- | mesonbuild/modules/__init__.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/modules/__init__.py b/mesonbuild/modules/__init__.py index 71536c1c6..967c2b39e 100644 --- a/mesonbuild/modules/__init__.py +++ b/mesonbuild/modules/__init__.py @@ -82,9 +82,11 @@ class ModuleState: def find_program(self, prog: T.Union[str, T.List[str]], required: bool = True, version_func: T.Optional[T.Callable[['ExternalProgram'], str]] = None, wanted: T.Optional[str] = None, silent: bool = False, - for_machine: MachineChoice = MachineChoice.HOST) -> 'ExternalProgram': + for_machine: MachineChoice = MachineChoice.HOST, + depname: T.Optional[str] = None, varname: T.Optional[str] = None) -> 'ExternalProgram': return self._interpreter.find_program_impl(prog, required=required, version_func=version_func, - wanted=wanted, silent=silent, for_machine=for_machine) + wanted=wanted, silent=silent, for_machine=for_machine, + depname=depname, varname=varname) def test(self, args: T.Tuple[str, T.Union[build.Executable, build.Jar, 'ExternalProgram', mesonlib.File]], workdir: T.Optional[str] = None, |