Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions mesonbuild/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from .mesonlib import (
HoldableObject, SecondLevelHolder,
File, MesonException, MachineChoice, PerMachine, OrderedSet, listify,
extract_as_list, typeslistify, stringlistify, classify_unity_sources,
extract_as_list, typeslistify, classify_unity_sources,
get_filenames_templates_dict, substitute_values, has_path_sep,
is_parent_path, relpath, PerMachineDefaultable,
MesonBugException, EnvironmentVariables, pickle_load, lazy_property,
Expand Down Expand Up @@ -85,7 +85,7 @@ class BuildTargetKeywordArguments(TypedDict, total=False):
install_dir: T.List[T.Union[str, Literal[False]]]
install_mode: FileMode
install_rpath: str
install_tag: T.List[str]
install_tag: T.List[T.Optional[str]]
language_args: T.DefaultDict[str, T.List[str]]
link_args: T.List[str]
link_depends: T.List[T.Union[str, File, CustomTarget, CustomTargetIndex]]
Expand Down Expand Up @@ -1295,7 +1295,7 @@ def process_kwargs(self, kwargs: BuildTargetKeywordArguments) -> None:
self.install_dir = typeslistify(kwargs.get('install_dir', []),
(str, bool))
self.install_mode = kwargs.get('install_mode', None)
self.install_tag = stringlistify(kwargs.get('install_tag', [None]))
self.install_tag: T.List[T.Optional[str]] = kwargs.get('install_tag') or [None]
self.extra_files = kwargs.get('extra_files', [])
self.install_rpath: str = kwargs.get('install_rpath', '')
self.build_rpath = kwargs.get('build_rpath', '')
Expand Down
2 changes: 2 additions & 0 deletions mesonbuild/interpreter/interpreter.py
Original file line number Diff line number Diff line change
Expand Up @@ -3553,6 +3553,8 @@ def build_target(self, node: mparser.BaseNode, args: T.Tuple[str, SourcesVarargs
if isinstance(kwargs['implib'], bool):
kwargs['implib'] = None

kwargs['install_tag'] = [kwargs['install_tag']]

target = targetclass(name, self.subdir, self.subproject, for_machine, srcs, struct, objs,
self.environment, self.compilers[for_machine], kwargs)
if objs and target.uses_rust():
Expand Down
1 change: 1 addition & 0 deletions mesonbuild/interpreter/kwargs.py
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ class _BaseBuildTarget(TypedDict):
gnu_symbol_visibility: str
install: bool
install_mode: FileMode
install_tag: T.Optional[str]
install_rpath: str
implicit_include_directories: bool
link_depends: T.List[T.Union[str, File, build.GeneratedTypes]]
Expand Down
1 change: 1 addition & 0 deletions mesonbuild/interpreter/type_checking.py
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,7 @@ def _extra_files_validator(args: T.List[T.Union[File, str]]) -> T.Optional[str]:
feature_validator=_target_install_feature_validator,
),
INSTALL_MODE_KW,
INSTALL_TAG_KW,
KwargInfo('implicit_include_directories', bool, default=True, since='0.42.0'),
NATIVE_KW,
KwargInfo('resources', ContainerTypeInfo(list, str), default=[], listify=True),
Expand Down
Loading