aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Sales de Andrade <quantum.analyst@gmail.com>2017-02-23 00:59:26 -0500
committerJussi Pakkanen <jpakkane@gmail.com>2017-02-26 07:28:54 -0500
commit7c5de87656ec3c01a8f3dc8b4194c07ebe67b91c (patch)
tree7bab27042582105e2c1a614cc769b6f9b6ad6de2
parent4f0e204c342aa1788b31b105c14aa7bdf914f882 (diff)
downloadmeson-7c5de87656ec3c01a8f3dc8b4194c07ebe67b91c.zip
meson-7c5de87656ec3c01a8f3dc8b4194c07ebe67b91c.tar.gz
meson-7c5de87656ec3c01a8f3dc8b4194c07ebe67b91c.tar.bz2
Raise if gobject-introspection is not found.
This used to produce a warning, but then would crash anyway. It's simpler if we just error out and have the user disable gir generation or install gobject-introspection.
-rw-r--r--mesonbuild/modules/gnome.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index bf4b8be..7c4c42d 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -371,11 +371,7 @@ class GnomeModule(ExtensionModule):
{'native': True})
pkgargs = self.gir_dep.get_compile_args()
except Exception:
- global girwarning_printed
- if not girwarning_printed:
- mlog.warning('gobject-introspection dependency was not found, disabling gir generation.')
- girwarning_printed = True
- return ModuleReturnValue(None, [])
+ raise MesonException('gobject-introspection dependency was not found, gir cannot be generated.')
ns = kwargs.pop('namespace')
nsversion = kwargs.pop('nsversion')
libsources = kwargs.pop('sources')