diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2025-08-05 11:08:58 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-10-20 15:15:53 -0700 |
| commit | e8623f3fcbd4ed3f5863ca445fc4963ffb8176c9 (patch) | |
| tree | 29c9cff8da2113e507b0ed253cabd05efe1e9228 | |
| parent | 8981317fdb765c58cbda079d3f3b2bd090ae7845 (diff) | |
| download | meson-e8623f3fcbd4ed3f5863ca445fc4963ffb8176c9.tar.gz | |
interpreter: fix more default_options annotations
| -rw-r--r-- | mesonbuild/interpreter/dependencyfallbacks.py | 3 | ||||
| -rw-r--r-- | mesonbuild/interpreter/kwargs.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/cmake.py | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/interpreter/dependencyfallbacks.py b/mesonbuild/interpreter/dependencyfallbacks.py index 4d9721ea2..4dd6802c6 100644 --- a/mesonbuild/interpreter/dependencyfallbacks.py +++ b/mesonbuild/interpreter/dependencyfallbacks.py @@ -19,6 +19,7 @@ if T.TYPE_CHECKING: from .interpreter import Interpreter from ..interpreterbase import TYPE_nkwargs, TYPE_nvar from ..mesonlib import MachineChoice + from ..options import ElementaryOptionValues from .interpreterobjects import SubprojectHolder @@ -27,7 +28,7 @@ class DependencyFallbacksHolder(MesonInterpreterObject): interpreter: 'Interpreter', names: T.List[str], allow_fallback: T.Optional[bool] = None, - default_options: T.Optional[T.Dict[str, str]] = None) -> None: + default_options: T.Optional[T.Dict[OptionKey, ElementaryOptionValues]] = None) -> None: super().__init__(subproject=interpreter.subproject) self.interpreter = interpreter self.subproject = interpreter.subproject diff --git a/mesonbuild/interpreter/kwargs.py b/mesonbuild/interpreter/kwargs.py index 5332067fd..aae2c3291 100644 --- a/mesonbuild/interpreter/kwargs.py +++ b/mesonbuild/interpreter/kwargs.py @@ -319,7 +319,7 @@ class Subproject(ExtractRequired): class DoSubproject(ExtractRequired): - default_options: T.Union[T.List[str], T.Dict[str, options.ElementaryOptionValues], str] + default_options: T.Dict[OptionKey, options.ElementaryOptionValues] version: T.List[str] cmake_options: T.List[str] options: T.Optional[CMakeSubprojectOptions] diff --git a/mesonbuild/modules/cmake.py b/mesonbuild/modules/cmake.py index 2e2abb889..700749078 100644 --- a/mesonbuild/modules/cmake.py +++ b/mesonbuild/modules/cmake.py @@ -435,7 +435,7 @@ class CmakeModule(ExtensionModule): 'required': kwargs_['required'], 'options': kwargs_['options'], 'cmake_options': kwargs_['cmake_options'], - 'default_options': [], + 'default_options': {}, 'version': [], } subp = self.interpreter.do_subproject(dirname, kw, force_method='cmake') |
