From a795ea3cd46fbde40a1cad3531ab4bf6dbe0d3db Mon Sep 17 00:00:00 2001 From: Patrick Griffis Date: Mon, 27 Feb 2017 06:12:09 -0500 Subject: [PATCH] gnome.genmarshal: Use --output when available This is just cleaner and works around #1417 --- mesonbuild/modules/gnome.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 8cf89e1e0..13ffabc7c 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -915,8 +915,14 @@ class GnomeModule(ExtensionModule): custom_kwargs = { 'input': sources, - 'capture': True, } + + # https://github.com/GNOME/glib/commit/0fbc98097fac4d3e647684f344e508abae109fdf + if mesonlib.version_compare(self._get_native_glib_version(state), '>= 2.51.0'): + cmd += ['--output', '@OUTPUT@'] + else: + custom_kwargs['capture'] = True + for arg in known_custom_target_kwargs: if arg in kwargs: custom_kwargs[arg] = kwargs[arg]