diff options
| author | Ninja-Koala <mail@ninjakoa.la> | 2019-03-17 15:31:14 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-03-17 19:26:11 +0200 |
| commit | 1a986c90ebfb2c62a2186815608b0dd8b5cbb2fe (patch) | |
| tree | 38b7268e7c977a1bc05f0bd1c3ae526bf08f9a42 | |
| parent | 33af33594943c066ff269d5144017e7b5e558fd5 (diff) | |
| download | meson-1a986c90ebfb2c62a2186815608b0dd8b5cbb2fe.tar.gz | |
Fix #5046
| -rw-r--r-- | mesonbuild/modules/gnome.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 4473bcbfb..8833a2141 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -189,9 +189,13 @@ class GnomeModule(ExtensionModule): gresource_ld_binary = True gresource = kwargs.pop('gresource_bundle', False) - if gresource or gresource_ld_binary: + + if gresource: g_output = args[0] + '.gresource' g_name = args[0] + '_gresource' + elif gresource_ld_binary: + g_output = args[0] + '_ld_binary.gresource' + g_name = args[0] + '_ld_binary_gresource' output = args[0] + '.c' name = args[0] + '_c' @@ -240,10 +244,7 @@ class GnomeModule(ExtensionModule): if gresource or gresource_ld_binary: target_g = GResourceTarget(g_name, state.subdir, state.subproject, g_kwargs) if gresource: # Only one target for .gresource files - if target_g.get_id() not in self.interpreter.build.targets: - return ModuleReturnValue(target_g, [target_g]) - else: - return ModuleReturnValue(target_g, []) + return ModuleReturnValue(target_g, [target_g]) target_c = GResourceTarget(name, state.subdir, state.subproject, kwargs) |