meson: cloudproviders fixes

Set min cloudproviders version.
Add libcloudproviders to gdk Requires.private.
CI: build/test with cloudproviders
This commit is contained in:
Christoph Reiter 2019-03-30 09:45:34 +01:00
parent b1bc86e905
commit 310dc4b6c4
4 changed files with 13 additions and 4 deletions

View File

@ -25,6 +25,7 @@ RUN dnf -y install \
hicolor-icon-theme \
itstool \
json-glib-devel \
libcloudproviders-devel \
libepoxy-devel \
libmount-devel \
librsvg2 \

View File

@ -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

View File

@ -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

View File

@ -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,