[gtk/matthiasc/cloudprovider-ci: 4/5] Add libcloudproviders as a fallback subproject
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/matthiasc/cloudprovider-ci: 4/5] Add libcloudproviders as a fallback subproject
- Date: Wed, 17 Jun 2020 17:56:38 +0000 (UTC)
commit 8085ecbeee7c3f6e54c2fd8257a6e1f37d6983d2
Author: Emmanuele Bassi <ebassi gnome org>
Date: Tue Jun 9 15:46:32 2020 +0100
Add libcloudproviders as a fallback subproject
We require a new version of libcloudproviders so that we can enable it
in our CI pipeline.
meson.build | 12 ++++++++++--
subprojects/libcloudproviders.wrap | 4 ++++
2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index 9d9e4e37b2..3453551c36 100644
--- a/meson.build
+++ b/meson.build
@@ -37,7 +37,7 @@ wayland_proto_req = '>= 1.20'
wayland_req = '>= 1.14.91'
graphene_req = '>= 1.9.1'
epoxy_req = '>= 1.4'
-cloudproviders_req = '>= 0.2.5'
+cloudproviders_req = '>= 0.3.1'
xkbcommon_req = '>= 0.2.0'
gnome = import('gnome')
@@ -666,7 +666,15 @@ endif
cloudproviders_enabled = get_option('cloudproviders')
if cloudproviders_enabled
- cloudproviders_dep = dependency('cloudproviders', required: true)
+ cloudproviders_dep = dependency('cloudproviders',
+ version: cloudproviders_req,
+ fallback: [
+ 'libcloudproviders',
+ 'libcloudproviders_dep',
+ ],
+ default_options: [
+ 'vapigen=false',
+ ])
if cloudproviders_dep.found()
cdata.set('HAVE_CLOUDPROVIDERS', cloudproviders_dep.found())
else
diff --git a/subprojects/libcloudproviders.wrap b/subprojects/libcloudproviders.wrap
new file mode 100644
index 0000000000..2b47d8cad6
--- /dev/null
+++ b/subprojects/libcloudproviders.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory=libcloudproviders
+url=https://gitlab.gnome.org/World/libcloudproviders.git
+revision=master
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]