diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2021-12-04 21:20:59 -0800 |
---|---|---|
committer | Eli Schwartz <eschwartz93@gmail.com> | 2022-01-18 21:58:24 -0500 |
commit | 216435b2ae5df1674c7b8819eea7d453f535b6f5 (patch) | |
tree | 24d0053db30d37e0e46f19c061a34c85ffcfc71a | |
parent | 41fe51b36ee99c5b943b5a2bb371ea73b548da0e (diff) | |
download | meson-216435b2ae5df1674c7b8819eea7d453f535b6f5.zip meson-216435b2ae5df1674c7b8819eea7d453f535b6f5.tar.gz meson-216435b2ae5df1674c7b8819eea7d453f535b6f5.tar.bz2 |
dependencies: fix libraries and whole_libraries types
gnome points out that CustomTargets can be linked with, so we should
allow that.
-rw-r--r-- | mesonbuild/dependencies/base.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index 713b8c4..b79be42 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -30,7 +30,7 @@ if T.TYPE_CHECKING: from .._typing import ImmutableListProtocol from ..compilers.compilers import Compiler from ..environment import Environment - from ..build import BuildTarget, CustomTarget + from ..build import BuildTarget, CustomTarget, IncludeDirs from ..mesonlib import FileOrString @@ -219,9 +219,10 @@ class Dependency(HoldableObject): return new_dep class InternalDependency(Dependency): - def __init__(self, version: str, incdirs: T.List[str], compile_args: T.List[str], - link_args: T.List[str], libraries: T.List['BuildTarget'], - whole_libraries: T.List['BuildTarget'], + def __init__(self, version: str, incdirs: T.List['IncludeDirs'], compile_args: T.List[str], + link_args: T.List[str], + libraries: T.List[T.Union['BuildTarget', 'CustomTarget']], + whole_libraries: T.List[T.Union['BuildTarget', 'CustomTarget']], sources: T.Sequence[T.Union['FileOrString', 'CustomTarget']], ext_deps: T.List[Dependency], variables: T.Dict[str, T.Any]): super().__init__(DependencyTypeName('internal'), {}) |