diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2023-05-24 09:39:01 -0400 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2023-08-24 18:51:13 -0400 |
| commit | f720105e242111f4b68c0cb2aa77a4301a2fd10f (patch) | |
| tree | d02ac5a61ef8386aa1d2555cbcd36815fe694c28 /mesonbuild/modules/__init__.py | |
| parent | 6f87215f1f7c104de2f8720e3c0926bcffdc7232 (diff) | |
| download | meson-f720105e242111f4b68c0cb2aa77a4301a2fd10f.tar.gz | |
find_program: Fallback if version mismatch
Fixes: #11797
Diffstat (limited to 'mesonbuild/modules/__init__.py')
| -rw-r--r-- | mesonbuild/modules/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/modules/__init__.py b/mesonbuild/modules/__init__.py index b46b30077..57c169d0b 100644 --- a/mesonbuild/modules/__init__.py +++ b/mesonbuild/modules/__init__.py @@ -26,6 +26,7 @@ from ..programs import ExternalProgram if T.TYPE_CHECKING: from ..interpreter import Interpreter + from ..interpreter.interpreter import ProgramVersionFunc from ..interpreter.interpreterobjects import MachineHolder from ..interpreterbase import TYPE_var, TYPE_kwargs from ..programs import OverrideProgram @@ -86,7 +87,7 @@ class ModuleState: def find_program(self, prog: T.Union[mesonlib.FileOrString, T.List[mesonlib.FileOrString]], required: bool = True, - version_func: T.Optional[T.Callable[[T.Union[ExternalProgram, build.Executable, OverrideProgram]], str]] = None, + version_func: T.Optional[ProgramVersionFunc] = None, wanted: T.Optional[str] = None, silent: bool = False, for_machine: MachineChoice = MachineChoice.HOST) -> T.Union[ExternalProgram, build.Executable, OverrideProgram]: if not isinstance(prog, list): |