diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-05-15 09:05:51 +0100 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-06-01 20:21:09 +0000 |
| commit | aa27f7cec95fcd02cb5384b7bf1022bad2b4cab0 (patch) | |
| tree | 06bfab4c13e7e8a7729a946588f62b255ca9d478 /mesonbuild/modules/windows.py | |
| parent | bf2e21ec0edeaf8e86ff6fd46c2c2fcfcc4713ed (diff) | |
| download | meson-aa27f7cec95fcd02cb5384b7bf1022bad2b4cab0.zip meson-aa27f7cec95fcd02cb5384b7bf1022bad2b4cab0.tar.gz meson-aa27f7cec95fcd02cb5384b7bf1022bad2b4cab0.tar.bz2 | |
Add a depend_files: keyword to windows.compile_resources()
Expose depend_files: from the custom_target this creates.
This is the change suggested in #2815, with tests and documentation added.
Fixes #2789 (duplicate #2830)
Diffstat (limited to 'mesonbuild/modules/windows.py')
| -rw-r--r-- | mesonbuild/modules/windows.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py index ac5b8b3..adb73d7 100644 --- a/mesonbuild/modules/windows.py +++ b/mesonbuild/modules/windows.py @@ -30,11 +30,12 @@ class WindowsModule(ExtensionModule): return compilers[l] raise MesonException('Resource compilation requires a C or C++ compiler.') - @permittedKwargs({'args', 'include_directories'}) + @permittedKwargs({'args', 'include_directories', 'depend_files'}) def compile_resources(self, state, args, kwargs): comp = self.detect_compiler(state.compilers) extra_args = mesonlib.stringlistify(kwargs.get('args', [])) + wrc_deps = extract_as_list(kwargs, 'depend_files', pop = True) inc_dirs = extract_as_list(kwargs, 'include_directories', pop = True) for incd in inc_dirs: if not isinstance(incd.held_object, (str, build.IncludeDirs)): @@ -83,6 +84,7 @@ class WindowsModule(ExtensionModule): 'output': '@BASENAME@.' + suffix, 'input': [src], 'command': [rescomp] + res_args, + 'depend_files': wrc_deps, } if isinstance(src, (str, mesonlib.File)): |