diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-09-19 21:20:02 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-19 21:20:02 +0300 |
| commit | 1556b1bdb0c5f94f2e3f2f0ebc59c8d9afeddc1c (patch) | |
| tree | 3fb5c9c681bf7071c0765c0f2d55d067a27d70ce /mesonbuild/modules/windows.py | |
| parent | 9c834a4ecddfa6ba38249be501d0ad1b481e48b1 (diff) | |
| parent | e553d0807bad5db8290e26954ce7634bc0e181fd (diff) | |
| download | meson-1556b1bdb0c5f94f2e3f2f0ebc59c8d9afeddc1c.zip meson-1556b1bdb0c5f94f2e3f2f0ebc59c8d9afeddc1c.tar.gz meson-1556b1bdb0c5f94f2e3f2f0ebc59c8d9afeddc1c.tar.bz2 | |
Merge pull request #2264 from jeandet/master
Some refactoring, introduction of listify function.
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().') |