[glib-networking] meson: Only run gio-querymodules if it's found
- From: Nirbheek Chauhan <nirbheekc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib-networking] meson: Only run gio-querymodules if it's found
- Date: Wed, 9 May 2018 16:57:02 +0000 (UTC)
commit 1d4a1d99fe15846b6365b78a31a9e166fe4a2dde
Author: Nirbheek Chauhan <nirbheek centricular com>
Date: Wed May 9 20:03:00 2018 +0530
meson: Only run gio-querymodules if it's found
And run the correct one if it's found
https://bugzilla.gnome.org/show_bug.cgi?id=795982
meson.build | 6 +++++-
meson_post_install.py | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index c841d67..fcc6a4a 100644
--- a/meson.build
+++ b/meson.build
@@ -131,7 +131,11 @@ endif
subdir('tls/gnutls')
subdir('tls/tests')
-meson.add_install_script('meson_post_install.py', gio_module_dir)
+# Will automatically pick it up from the cross file if defined
+gio_querymodules = find_program('gio-querymodules', required : false)
+if gio_querymodules.found()
+ meson.add_install_script('meson_post_install.py', gio_querymodules.path(), gio_module_dir)
+endif
output = '\n\n libproxy support: ' + enable_libproxy_support.to_string() + '\n'
output += ' GNOME proxy support: ' + enable_gnome_proxy_support.to_string() + '\n'
diff --git a/meson_post_install.py b/meson_post_install.py
index 3082d42..8960540 100644
--- a/meson_post_install.py
+++ b/meson_post_install.py
@@ -6,4 +6,4 @@ import sys
if not os.environ.get('DESTDIR'):
print('GIO module cache creation...')
- subprocess.call(['gio-querymodules', sys.argv[1]])
+ subprocess.call([sys.argv[1], sys.argv[2]])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]