diff options
| author | ePirat <epirat07@gmail.com> | 2019-07-05 21:20:16 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-07-05 22:20:16 +0300 |
| commit | b347f00dc0a921f99ade780223a2fd3a18431cc6 (patch) | |
| tree | 993ccadfe1ee7f259aec44a7e99b4d0e9b855d84 | |
| parent | 1e182b51c63bae7d0354334829de21eb5483ddf3 (diff) | |
| download | meson-b347f00dc0a921f99ade780223a2fd3a18431cc6.zip meson-b347f00dc0a921f99ade780223a2fd3a18431cc6.tar.gz meson-b347f00dc0a921f99ade780223a2fd3a18431cc6.tar.bz2 | |
Fix windres module argument flattening
| -rw-r--r-- | mesonbuild/modules/windows.py | 4 | ||||
| -rw-r--r-- | test cases/windows/5 resources/res/meson.build | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py index efc3218..7cf46f7 100644 --- a/mesonbuild/modules/windows.py +++ b/mesonbuild/modules/windows.py @@ -23,7 +23,7 @@ from . import get_include_args from . import ModuleReturnValue from . import ExtensionModule from ..interpreter import CustomTargetHolder -from ..interpreterbase import permittedKwargs, FeatureNewKwargs +from ..interpreterbase import permittedKwargs, FeatureNewKwargs, flatten from ..dependencies import ExternalProgram class ResourceCompilerType(enum.Enum): @@ -78,7 +78,7 @@ class WindowsModule(ExtensionModule): @FeatureNewKwargs('windows.compile_resources', '0.47.0', ['depend_files', 'depends']) @permittedKwargs({'args', 'include_directories', 'depend_files', 'depends'}) def compile_resources(self, state, args, kwargs): - extra_args = mesonlib.stringlistify(kwargs.get('args', [])) + extra_args = mesonlib.stringlistify(flatten(kwargs.get('args', []))) wrc_depend_files = extract_as_list(kwargs, 'depend_files', pop = True) wrc_depends = extract_as_list(kwargs, 'depends', pop = True) for d in wrc_depends: diff --git a/test cases/windows/5 resources/res/meson.build b/test cases/windows/5 resources/res/meson.build index 160d651..74e0778 100644 --- a/test cases/windows/5 resources/res/meson.build +++ b/test cases/windows/5 resources/res/meson.build @@ -2,7 +2,8 @@ win = import('windows') res = win.compile_resources('myres.rc', depend_files: 'sample.ico', - include_directories : inc) + include_directories : inc, + args : [['-DFOO'], '-DBAR']) # test that with MSVC tools, LIB/LINK invokes CVTRES with correct /MACHINE static_library('reslib', res, 'dummy.c') |