[json-glib: 1/7] Meson: Add glib fallback
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [json-glib: 1/7] Meson: Add glib fallback
- Date: Wed, 23 Jan 2019 15:30:55 +0000 (UTC)
commit 9d7a3bf039f063d78dc8db84e0de7b6310206b2c
Author: Xavier Claessens <xavier claessens collabora com>
Date: Sat Oct 27 06:17:12 2018 -0400
Meson: Add glib fallback
json-glib/meson.build | 4 ++--
meson.build | 4 ++--
subprojects/glib.wrap | 5 +++++
3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/json-glib/meson.build b/json-glib/meson.build
index eb1c793..bc8469a 100644
--- a/json-glib/meson.build
+++ b/json-glib/meson.build
@@ -76,7 +76,7 @@ json_lib = library(
version: libversion,
soversion: soversion,
include_directories: root_dir,
- dependencies: [ gio_dep, gobject_dep, ],
+ dependencies: [gio_dep],
c_args: json_c_args + common_cflags,
link_args: common_ldflags,
install: true,
@@ -121,7 +121,7 @@ endif
json_glib_dep = declare_dependency(
link_with: json_lib,
include_directories: root_dir,
- dependencies: [ gobject_dep, gio_dep, ],
+ dependencies: [gio_dep],
sources: [ json_enum_types_h, json_glib_gir ],
)
diff --git a/meson.build b/meson.build
index f585934..8d54d78 100644
--- a/meson.build
+++ b/meson.build
@@ -34,8 +34,8 @@ json_libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'))
# Dependencies
glib_req_version = '>= 2.44.0'
-gobject_dep = dependency('gobject-2.0', version: glib_req_version)
-gio_dep = dependency('gio-2.0', version: glib_req_version)
+gio_dep = dependency('gio-2.0', version: glib_req_version,
+ fallback: ['glib', 'libgio_dep'])
# Configurations
cc = meson.get_compiler('c')
diff --git a/subprojects/glib.wrap b/subprojects/glib.wrap
new file mode 100644
index 0000000..87021ae
--- /dev/null
+++ b/subprojects/glib.wrap
@@ -0,0 +1,5 @@
+[wrap-git]
+directory=glib
+url=https://gitlab.gnome.org/GNOME/glib.git
+push-url=git gitlab gnome org:GNOME/glib.git
+revision=master
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]