diff options
| -rw-r--r-- | mesonbuild/dependencies/base.py | 1 | ||||
| -rw-r--r-- | mesonbuild/dependencies/dev.py | 2 | ||||
| -rw-r--r-- | mesonbuild/dependencies/qt.py | 2 | ||||
| -rw-r--r-- | mesonbuild/interpreter/kwargs.py | 1 | ||||
| -rw-r--r-- | mesonbuild/interpreter/type_checking.py | 1 |
5 files changed, 5 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index 50cb470ed..ead1eece6 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -48,6 +48,7 @@ if T.TYPE_CHECKING: components: T.List[str] include_type: IncludeType language: T.Optional[str] + main: bool _MissingCompilerBase = Compiler else: diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index 2b3931774..1bfc166f2 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -129,7 +129,7 @@ class GMockDependencySystem(SystemDependency): # want to avoid linking in main() from GTest gtest_kwargs = kwargs.copy() if self.main: - gtest_kwargs['main'] = False # type: ignore[typeddict-unknown-key] + gtest_kwargs['main'] = False # GMock without GTest is pretty much useless # this also mimics the structure given in WrapDB, diff --git a/mesonbuild/dependencies/qt.py b/mesonbuild/dependencies/qt.py index a277de5ae..86f6faff3 100644 --- a/mesonbuild/dependencies/qt.py +++ b/mesonbuild/dependencies/qt.py @@ -139,7 +139,7 @@ class _QtBase: if not self.requested_modules: raise DependencyException('No ' + self.qtname + ' modules specified.') - self.qtmain = T.cast('bool', kwargs.get('main', False)) + self.qtmain = kwargs.get('main', False) if not isinstance(self.qtmain, bool): raise DependencyException('"main" argument must be a boolean') diff --git a/mesonbuild/interpreter/kwargs.py b/mesonbuild/interpreter/kwargs.py index dcdd39cb1..5cd26a393 100644 --- a/mesonbuild/interpreter/kwargs.py +++ b/mesonbuild/interpreter/kwargs.py @@ -502,3 +502,4 @@ class FuncDependency(TypedDict): fallback: T.Union[str, T.List[str], None] include_type: IncludeType language: T.Optional[str] + main: bool diff --git a/mesonbuild/interpreter/type_checking.py b/mesonbuild/interpreter/type_checking.py index e8752d55a..0f10a14a8 100644 --- a/mesonbuild/interpreter/type_checking.py +++ b/mesonbuild/interpreter/type_checking.py @@ -914,4 +914,5 @@ DEPENDENCY_KWS: T.List[KwargInfo] = [ KwargInfo('fallback', (ContainerTypeInfo(list, str), str, NoneType), since='0.54.0'), KwargInfo('language', (str, NoneType), convertor=lambda x: x.lower() if x is not None else x, validator=lambda x: 'Must be a valid language if set' if (x is not None and x not in compilers.all_languages) else None), + KwargInfo('main', bool, default=False), ] |