diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2024-12-06 12:17:26 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-10-20 15:15:53 -0700 |
| commit | f085899f1e83a317b52034e97057b440458b2a62 (patch) | |
| tree | 46a9e2c347deb2510c370ba0c4dbd4651d172ee1 /mesonbuild | |
| parent | 035b8e4c013d686da7ab433b643338f696e15500 (diff) | |
| download | meson-f085899f1e83a317b52034e97057b440458b2a62.tar.gz | |
interpreter: port cmake_args to typed_kwargs
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/dependencies/cmake.py | 2 | ||||
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 2 | ||||
| -rw-r--r-- | mesonbuild/interpreter/kwargs.py | 1 | ||||
| -rw-r--r-- | mesonbuild/interpreter/type_checking.py | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/cmake.py b/mesonbuild/dependencies/cmake.py index c995fc79c..2804caf5f 100644 --- a/mesonbuild/dependencies/cmake.py +++ b/mesonbuild/dependencies/cmake.py @@ -117,7 +117,7 @@ class CMakeDependency(ExternalDependency): # Setup the trace parser self.traceparser = CMakeTraceParser(self.cmakebin.version(), self._get_build_dir(), self.env) - cm_args = stringlistify(extract_as_list(kwargs, 'cmake_args')) # type: ignore[arg-type] + cm_args = kwargs.get('cmake_args', []) cm_args = check_cmake_args(cm_args) if CMakeDependency.class_cmakeinfo[self.for_machine] is None: CMakeDependency.class_cmakeinfo[self.for_machine] = self._get_cmake_info(cm_args) diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 0f6114199..fee798b6f 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -1791,7 +1791,7 @@ class Interpreter(InterpreterBase, HoldableObject): @FeatureNewKwargs('dependency', '0.57.0', ['cmake_package_version']) @FeatureNewKwargs('dependency', '0.54.0', ['components']) @FeatureNewKwargs('dependency', '0.52.0', ['include_type']) - @FeatureNewKwargs('dependency', '0.50.0', ['not_found_message', 'cmake_module_path', 'cmake_args']) + @FeatureNewKwargs('dependency', '0.50.0', ['not_found_message', 'cmake_module_path']) @FeatureNewKwargs('dependency', '0.49.0', ['disabler']) @FeatureNewKwargs('dependency', '0.40.0', ['method']) @disablerIfNotFound diff --git a/mesonbuild/interpreter/kwargs.py b/mesonbuild/interpreter/kwargs.py index 481c126f4..9230f3625 100644 --- a/mesonbuild/interpreter/kwargs.py +++ b/mesonbuild/interpreter/kwargs.py @@ -495,3 +495,4 @@ class FuncDependency(TypedDict): default_options: T.Dict[OptionKey, options.ElementaryOptionValues] allow_fallback: T.Optional[bool] + cmake_args: T.List[str] diff --git a/mesonbuild/interpreter/type_checking.py b/mesonbuild/interpreter/type_checking.py index 4f8e04fe1..6a8aa9ba4 100644 --- a/mesonbuild/interpreter/type_checking.py +++ b/mesonbuild/interpreter/type_checking.py @@ -899,4 +899,5 @@ PKGCONFIG_DEFINE_KW: KwargInfo = KwargInfo( DEPENDENCY_KWS: T.List[KwargInfo] = [ DEFAULT_OPTIONS.evolve(since='0.38.0'), KwargInfo('allow_fallback', (bool, NoneType), since='0.56.0'), + KwargInfo('cmake_args', ContainerTypeInfo(list, str), listify=True, default=[], since='0.50.0'), ] |