[glib-networking] meson: Set GIO_EXTRA_MODULES in devenv
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib-networking] meson: Set GIO_EXTRA_MODULES in devenv
- Date: Mon, 21 Feb 2022 22:35:50 +0000 (UTC)
commit 27bf969fb3ebd639117efe7151ef24d5cf48ee57
Author: Xavier Claessens <xavier claessens collabora com>
Date: Mon Feb 21 13:29:39 2022 -0500
meson: Set GIO_EXTRA_MODULES in devenv
This makes GIO find modules within "meson devenv" without having
to install it on the system.
Part-of: <https://gitlab.gnome.org/GNOME/glib-networking/-/merge_requests/208>
proxy/environment/meson.build | 6 ++++++
proxy/gnome/meson.build | 6 ++++++
proxy/libproxy/meson.build | 6 ++++++
tls/gnutls/meson.build | 6 ++++++
tls/openssl/meson.build | 6 ++++++
5 files changed, 30 insertions(+)
---
diff --git a/proxy/environment/meson.build b/proxy/environment/meson.build
index 9f8a4133..5cbd5bcf 100644
--- a/proxy/environment/meson.build
+++ b/proxy/environment/meson.build
@@ -36,3 +36,9 @@ if get_option('static_modules')
endif
proxy_test_programs += [['environment', 'environment', deps]]
+
+if meson.version().version_compare('>=0.58')
+ env = environment()
+ env.prepend('GIO_EXTRA_MODULES', meson.current_build_dir())
+ meson.add_devenv(env)
+endif
diff --git a/proxy/gnome/meson.build b/proxy/gnome/meson.build
index dd4bc5be..17521cbb 100644
--- a/proxy/gnome/meson.build
+++ b/proxy/gnome/meson.build
@@ -33,3 +33,9 @@ if get_option('static_modules')
endif
proxy_test_programs += [['gnome', 'gnome', deps]]
+
+if meson.version().version_compare('>=0.58')
+ env = environment()
+ env.prepend('GIO_EXTRA_MODULES', meson.current_build_dir())
+ meson.add_devenv(env)
+endif
diff --git a/proxy/libproxy/meson.build b/proxy/libproxy/meson.build
index 7a766b3d..28fbc840 100644
--- a/proxy/libproxy/meson.build
+++ b/proxy/libproxy/meson.build
@@ -71,3 +71,9 @@ executable(
)
proxy_test_programs += [['environment', 'libproxy', deps]]
+
+if meson.version().version_compare('>=0.58')
+ env = environment()
+ env.prepend('GIO_EXTRA_MODULES', meson.current_build_dir())
+ meson.add_devenv(env)
+endif
diff --git a/tls/gnutls/meson.build b/tls/gnutls/meson.build
index ac46981d..0abf889e 100644
--- a/tls/gnutls/meson.build
+++ b/tls/gnutls/meson.build
@@ -43,3 +43,9 @@ if get_option('static_modules')
)
pkg.generate(module)
endif
+
+if meson.version().version_compare('>=0.58')
+ env = environment()
+ env.prepend('GIO_EXTRA_MODULES', meson.current_build_dir())
+ meson.add_devenv(env)
+endif
diff --git a/tls/openssl/meson.build b/tls/openssl/meson.build
index eb242f63..b24bed82 100644
--- a/tls/openssl/meson.build
+++ b/tls/openssl/meson.build
@@ -56,3 +56,9 @@ if get_option('static_modules')
)
pkg.generate(module)
endif
+
+if meson.version().version_compare('>=0.58')
+ env = environment()
+ env.prepend('GIO_EXTRA_MODULES', meson.current_build_dir())
+ meson.add_devenv(env)
+endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]