diff options
| author | Alexis Jeandet <alexis.jeandet@member.fsf.org> | 2017-08-29 22:21:11 +0200 |
|---|---|---|
| committer | Alexis Jeandet <alexis.jeandet@member.fsf.org> | 2017-09-18 22:21:22 +0200 |
| commit | bf64cf569b6ecf90db0f2bb181edb8f0ff0c9a3b (patch) | |
| tree | a8af035a5f74383528e1b28d8e16b6d545364347 /mesonbuild/modules/windows.py | |
| parent | 55975f852e502137e3d78d6af204f1bc58a98551 (diff) | |
| download | meson-bf64cf569b6ecf90db0f2bb181edb8f0ff0c9a3b.zip meson-bf64cf569b6ecf90db0f2bb181edb8f0ff0c9a3b.tar.gz meson-bf64cf569b6ecf90db0f2bb181edb8f0ff0c9a3b.tar.bz2 | |
Gnome, pkgconfig, Qt4, Qt5 and windows modules slightly refactored.
Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Diffstat (limited to 'mesonbuild/modules/windows.py')
| -rw-r--r-- | mesonbuild/modules/windows.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py index 6fef5bb..ab215dc 100644 --- a/mesonbuild/modules/windows.py +++ b/mesonbuild/modules/windows.py @@ -16,7 +16,7 @@ import os from .. import mlog from .. import mesonlib, dependencies, build -from ..mesonlib import MesonException +from ..mesonlib import MesonException, extract_as_list from . import get_include_args from . import ModuleReturnValue from . import ExtensionModule @@ -35,9 +35,7 @@ class WindowsModule(ExtensionModule): comp = self.detect_compiler(state.compilers) extra_args = mesonlib.stringlistify(kwargs.get('args', [])) - inc_dirs = kwargs.pop('include_directories', []) - if not isinstance(inc_dirs, list): - inc_dirs = [inc_dirs] + inc_dirs = extract_as_list(kwargs, 'include_directories', pop = True) for incd in inc_dirs: if not isinstance(incd.held_object, (str, build.IncludeDirs)): raise MesonException('Resource include dirs should be include_directories().') |