diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2022-06-14 20:37:57 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2022-06-17 14:33:01 -0400 |
| commit | edb38fd6f64f9b3b4f2fd7ef17cc3eddc9d0d7ad (patch) | |
| tree | 8ec09e29210febc04529ac673eafef218693ef7e | |
| parent | c1aeb2f7e4ef81a046ca28d5dad89bb8fdeefafd (diff) | |
| download | meson-edb38fd6f64f9b3b4f2fd7ef17cc3eddc9d0d7ad.zip meson-edb38fd6f64f9b3b4f2fd7ef17cc3eddc9d0d7ad.tar.gz meson-edb38fd6f64f9b3b4f2fd7ef17cc3eddc9d0d7ad.tar.bz2 | |
fix confusing incorrect default name for a KwargInfo
We can use this lots of places, and it's always the same kwarg. There
doesn't seem to be a point in naming it badly, then evolving it to the
standard name in the one place it is currently used. This made it not
shareable.
| -rw-r--r-- | mesonbuild/interpreter/type_checking.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/windows.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/interpreter/type_checking.py b/mesonbuild/interpreter/type_checking.py index d3f2d34..ec23f36 100644 --- a/mesonbuild/interpreter/type_checking.py +++ b/mesonbuild/interpreter/type_checking.py @@ -328,7 +328,7 @@ CT_BUILD_ALWAYS_STALE: KwargInfo[T.Optional[bool]] = KwargInfo( INSTALL_DIR_KW: KwargInfo[T.Optional[str]] = KwargInfo('install_dir', (str, NoneType)) INCLUDE_DIRECTORIES: KwargInfo[T.List[T.Union[str, IncludeDirs]]] = KwargInfo( - 'include_dirs', + 'include_directories', ContainerTypeInfo(list, (str, IncludeDirs)), listify=True, default=[], diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py index 0033fe9..58a08a7 100644 --- a/mesonbuild/modules/windows.py +++ b/mesonbuild/modules/windows.py @@ -111,7 +111,7 @@ class WindowsModule(ExtensionModule): 'winddows.compile_resoures', DEPEND_FILES_KW.evolve(since='0.47.0'), DEPENDS_KW.evolve(since='0.47.0'), - INCLUDE_DIRECTORIES.evolve(name='include_directories'), + INCLUDE_DIRECTORIES, KwargInfo('args', ContainerTypeInfo(list, str), default=[], listify=True), ) def compile_resources(self, state: 'ModuleState', |