diff options
| author | Patrick Griffis <tingping@tingping.se> | 2017-02-27 06:12:09 -0500 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-03-03 14:11:44 -0500 |
| commit | a795ea3cd46fbde40a1cad3531ab4bf6dbe0d3db (patch) | |
| tree | 14f8e1d69131698ab9c539f03f62183540ef0a6f /mesonbuild | |
| parent | 293520f55f13de5db95732a84dbd3637ba6c6163 (diff) | |
| download | meson-a795ea3cd46fbde40a1cad3531ab4bf6dbe0d3db.zip meson-a795ea3cd46fbde40a1cad3531ab4bf6dbe0d3db.tar.gz meson-a795ea3cd46fbde40a1cad3531ab4bf6dbe0d3db.tar.bz2 | |
gnome.genmarshal: Use --output when available
This is just cleaner and works around #1417
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 8cf89e1..13ffabc 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] |