diff options
| -rw-r--r-- | mesonbuild/backend/backends.py | 2 | ||||
| -rw-r--r-- | mesonbuild/build.py | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 1505206..67bc8bf 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -1044,7 +1044,7 @@ class Backend: tests. """ result: T.Set[str] = set() - prospectives: T.Set[T.Union[build.BuildTarget, build.CustomTarget, build.CustomTargetIndex]] = set() + prospectives: T.Set[build.BuildTargetTypes] = set() if isinstance(target, build.BuildTarget): prospectives.update(target.get_transitive_link_deps()) # External deps diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 5882133..6f5c9bb 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -58,6 +58,7 @@ if T.TYPE_CHECKING: GeneratedTypes = T.Union['CustomTarget', 'CustomTargetIndex', 'GeneratedList'] LibTypes = T.Union['SharedLibrary', 'StaticLibrary', 'CustomTarget', 'CustomTargetIndex'] + BuildTargetTypes = T.Union['BuildTarget', 'CustomTarget', 'CustomTargetIndex'] pch_kwargs = {'c_pch', 'cpp_pch'} @@ -1066,11 +1067,11 @@ class BuildTarget(Target): return ExtractedObjects(self, self.sources, self.generated, self.objects, recursive) - def get_all_link_deps(self) -> 'ImmutableListProtocol[T.Union[BuildTarget, CustomTarget, CustomTargetIndex]]': + def get_all_link_deps(self) -> ImmutableListProtocol[BuildTargetTypes]: return self.get_transitive_link_deps() @lru_cache(maxsize=None) - def get_transitive_link_deps(self) -> 'ImmutableListProtocol[T.Union[BuildTarget, CustomTarget, CustomTargetIndex]]': + def get_transitive_link_deps(self) -> ImmutableListProtocol[BuildTargetTypes]: result: T.List[Target] = [] for i in self.link_targets: result += i.get_all_link_deps() @@ -2402,7 +2403,7 @@ class CommandBase: dependencies: T.List[T.Union[BuildTarget, 'CustomTarget']] subproject: str - def flatten_command(self, cmd: T.Sequence[T.Union[str, File, programs.ExternalProgram, 'BuildTarget', 'CustomTarget', 'CustomTargetIndex']]) -> \ + def flatten_command(self, cmd: T.Sequence[T.Union[str, File, programs.ExternalProgram, BuildTargetTypes]]) -> \ T.List[T.Union[str, File, BuildTarget, 'CustomTarget']]: cmd = listify(cmd) final_cmd: T.List[T.Union[str, File, BuildTarget, 'CustomTarget']] = [] @@ -2444,10 +2445,11 @@ class CustomTarget(Target, CommandBase): subproject: str, environment: environment.Environment, command: T.Sequence[T.Union[ - str, BuildTarget, CustomTarget, CustomTargetIndex, GeneratedList, programs.ExternalProgram, File]], + str, BuildTargetTypes, GeneratedList, + programs.ExternalProgram, File]], sources: T.Sequence[T.Union[ - str, File, BuildTarget, CustomTarget, CustomTargetIndex, - ExtractedObjects, GeneratedList, programs.ExternalProgram]], + str, File, BuildTargetTypes, ExtractedObjects, + GeneratedList, programs.ExternalProgram]], outputs: T.List[str], *, build_always_stale: bool = False, @@ -2633,7 +2635,7 @@ class RunTarget(Target, CommandBase): typename = 'run' def __init__(self, name: str, - command: T.Sequence[T.Union[str, File, BuildTarget, 'CustomTarget', 'CustomTargetIndex', programs.ExternalProgram]], + command: T.Sequence[T.Union[str, File, BuildTargetTypes, programs.ExternalProgram]], dependencies: T.Sequence[Target], subdir: str, subproject: str, |