[gtk/gtk-3-24-meson: 59/66] meson: cloudproviders fixes
- From: Christoph Reiter <creiter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/gtk-3-24-meson: 59/66] meson: cloudproviders fixes
- Date: Sat, 30 Mar 2019 20:19:01 +0000 (UTC)
commit 3b100983706c81cbb0dcbd3a281d2303ccb14ae0
Author: Christoph Reiter <creiter src gnome org>
Date: Sat Mar 30 09:45:34 2019 +0100
meson: cloudproviders fixes
Set min cloudproviders version.
Add libcloudproviders to gdk Requires.private.
CI: build/test with cloudproviders
.gitlab-ci/Dockerfile | 1 +
.gitlab-ci/test-docker-autotools.sh | 2 +-
.gitlab-ci/test-docker-meson.sh | 7 ++++++-
meson.build | 7 +++++--
4 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 6258a39602..d9fa23d31d 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -25,6 +25,7 @@ RUN dnf -y install \
hicolor-icon-theme \
itstool \
json-glib-devel \
+ libcloudproviders-devel \
libepoxy-devel \
libmount-devel \
librsvg2 \
diff --git a/.gitlab-ci/test-docker-autotools.sh b/.gitlab-ci/test-docker-autotools.sh
index 523582e119..ca84162309 100755
--- a/.gitlab-ci/test-docker-autotools.sh
+++ b/.gitlab-ci/test-docker-autotools.sh
@@ -6,5 +6,5 @@ mkdir -p _ccache
export CCACHE_BASEDIR="$(pwd)"
export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
-./autogen.sh
+./autogen.sh --enable-cloudproviders
make -j8
diff --git a/.gitlab-ci/test-docker-meson.sh b/.gitlab-ci/test-docker-meson.sh
index b24c866c08..e9168e0426 100755
--- a/.gitlab-ci/test-docker-meson.sh
+++ b/.gitlab-ci/test-docker-meson.sh
@@ -9,7 +9,12 @@ export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
export PATH="${HOME}/.local/bin:${PATH}"
python3 -m pip install --user meson==0.49.2
-meson -Ddocumentation=true -Dman-pages=true _build
+meson \
+ -Dcloudproviders=true \
+ -Ddocumentation=true \
+ -Dman-pages=true \
+ _build
+
cd _build
ninja
diff --git a/meson.build b/meson.build
index 2fb5f5513a..4535c82bdd 100644
--- a/meson.build
+++ b/meson.build
@@ -721,9 +721,11 @@ if os_unix
endif
cloudproviders_enabled = get_option('cloudproviders')
+cloudproviders_packages = []
if cloudproviders_enabled
- cloudproviders_dep = dependency('cloudproviders', required: true)
+ cloudproviders_dep = dependency('cloudproviders', version: cloudproviders_req, required: true)
if cloudproviders_dep.found()
+ cloudproviders_packages += ['cloudproviders', cloudproviders_req]
cdata.set('HAVE_CLOUDPROVIDERS', cloudproviders_dep.found())
else
error('Cloudproviders support not found, but was explicitly requested.')
@@ -790,7 +792,8 @@ endif
pkgconf.set('GDK_PRIVATE_PACKAGES',
' '.join(gio_packages + x11_pkgs + wayland_pkgs + cairo_backends +
- ['epoxy', epoxy_req, 'fribidi', fribidi_req]))
+ ['epoxy', epoxy_req] + cloudproviders_packages +
+ ['fribidi', fribidi_req]))
gtk_packages = ' '.join([
atk_dep.name(), atk_req,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]