summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2025-12-10 10:13:39 -0800
committerDylan Baker <dylan@pnwbakers.com>2025-12-16 10:08:34 -0800
commit1fc6c70b32bf09446ef4d26c3c193b603611be3e (patch)
treed1b13e378ed453990aa7726b38dd7bdaaded7127
parent13c29488c78be6bf28dec90f2108fbb088c2b8f7 (diff)
downloadmeson-1fc6c70b32bf09446ef4d26c3c193b603611be3e.tar.gz
interpreter: use typed_kwargs ifor dependency (include_directories) strings
Instead of using the `extract_incdirs` function.
-rw-r--r--mesonbuild/interpreter/interpreter.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py
index e3d321e9a..b24b9e761 100644
--- a/mesonbuild/interpreter/interpreter.py
+++ b/mesonbuild/interpreter/interpreter.py
@@ -673,7 +673,7 @@ class Interpreter(InterpreterBase, HoldableObject):
D_MODULE_VERSIONS_KW.evolve(since='0.62.0'),
KwargInfo('link_args', ContainerTypeInfo(list, str), listify=True, default=[]),
DEPENDENCIES_KW,
- INCLUDE_DIRECTORIES,
+ INCLUDE_DIRECTORIES.evolve(since_values={ContainerTypeInfo(list, str): '0.50.0'}),
LINK_WITH_KW,
LINK_WHOLE_KW.evolve(since='0.46.0'),
DEPENDENCY_SOURCES_KW,
@@ -685,7 +685,7 @@ class Interpreter(InterpreterBase, HoldableObject):
def func_declare_dependency(self, node: mparser.BaseNode, args: T.List[TYPE_var],
kwargs: kwtypes.FuncDeclareDependency) -> dependencies.Dependency:
deps = kwargs['dependencies']
- incs = self.extract_incdirs(kwargs, strings_since='0.50.0')
+ incs = self.extract_incdirs(kwargs)
libs = kwargs['link_with']
libs_whole = kwargs['link_whole']
objects = kwargs['objects']