diff options
| author | Patrick Griffis <tingping@tingping.se> | 2016-10-18 19:09:39 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-10-19 21:15:05 +0300 |
| commit | 22debf6ffcb387c1fa555815432dc9535d228136 (patch) | |
| tree | 45650699937fd6e20a215b0bfa21fca91a618086 | |
| parent | c4fabc8ecf96573b3204fc21927de64240edf19d (diff) | |
| download | meson-22debf6ffcb387c1fa555815432dc9535d228136.zip meson-22debf6ffcb387c1fa555815432dc9535d228136.tar.gz meson-22debf6ffcb387c1fa555815432dc9535d228136.tar.bz2 | |
gnome: Fix gresource warning incorrectly being shown on 2.50+
| -rw-r--r-- | mesonbuild/modules/gnome.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 678ae82..287005b 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -38,20 +38,19 @@ class GnomeModule: native_glib_version = glib_dep.get_modversion() return native_glib_version - def __print_gresources_warning(self): + def __print_gresources_warning(self, state): global gresource_warning_printed if not gresource_warning_printed: - mlog.log('Warning, GLib compiled dependencies do not work fully ' - 'with versions of GLib older than 2.50.0.\n' - 'See the following upstream issue:', - mlog.bold('https://bugzilla.gnome.org/show_bug.cgi?id=745754')) + if mesonlib.version_compare(self.get_native_glib_version(state), '< 2.50.0'): + mlog.log('Warning, GLib compiled dependencies do not work fully ' + 'with versions of GLib older than 2.50.0.\n' + 'See the following upstream issue:', + mlog.bold('https://bugzilla.gnome.org/show_bug.cgi?id=745754')) gresource_warning_printed = True return [] def compile_resources(self, state, args, kwargs): - if mesonlib.version_compare(self.get_native_glib_version(state), - '< 2.50.0'): - self.__print_gresources_warning() + self.__print_gresources_warning(state) cmd = ['glib-compile-resources', '@INPUT@'] @@ -114,7 +113,7 @@ class GnomeModule: return [target_c, target_h] def get_gresource_dependencies(self, state, input_file, source_dirs, dependencies): - self.__print_gresources_warning() + self.__print_gresources_warning(state) for dep in dependencies: if not isinstance(dep, interpreter.CustomTargetHolder) and not \ |