summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2018-04-21 15:20:19 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2018-04-21 15:20:19 +0530
commit6afff742fcd413c09963f4610aae0cc8e5a06922 (patch)
treee1eede9ab243b5745905c8551a084d6e0d27d261
parent4a10abf0c695dc4a19ea79767c02f3d0c24af22d (diff)
downloadmeson-nirbheek/gnome-module-dont-require-pkgconfig.tar.gz
gnome: Actually assume glib version is 2.54 if not foundnirbheek/gnome-module-dont-require-pkgconfig
It is actually not possible to build most projects with the GNOME module if your glib is older, particularly genmarshal and gdbus-codegen generate unusable output without newer arguments that were added for Meson.
-rw-r--r--mesonbuild/modules/gnome.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index 71f529b14..abefe0579 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -71,8 +71,9 @@ class GnomeModule(ExtensionModule):
if glib_dep.found():
native_glib_version = glib_dep.get_version()
else:
- mlog.warning('Could not detect glib version, assuming 2.0')
- native_glib_version = '2.0'
+ mlog.warning('Could not detect glib version, assuming 2.54. '
+ 'You may get build errors if your glib is older.')
+ native_glib_version = '2.54'
return native_glib_version
def __print_gresources_warning(self, state):