diff options
author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2019-02-21 18:14:19 +0100 |
---|---|---|
committer | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2019-02-23 18:12:57 +0100 |
commit | 465ec84bbba2c45627d560438096509a00484c18 (patch) | |
tree | f26f3a2ace321da62553fbdf48f9ba3d5fd893b0 | |
parent | 62287f73dc211d3785c599646588a9b4737afa06 (diff) | |
download | libchamplain-465ec84bbba2c45627d560438096509a00484c18.tar.gz |
meson: Add proper Requires to pc files
Make a correction to the Requires specified in the autotools build:
- champlain requires cairo
Fixes https://gitlab.gnome.org/GNOME/libchamplain/issues/46
-rw-r--r-- | champlain-gtk/meson.build | 12 | ||||
-rw-r--r-- | champlain/meson.build | 14 | ||||
-rw-r--r-- | demos/meson.build | 17 |
3 files changed, 25 insertions, 18 deletions
diff --git a/champlain-gtk/meson.build b/champlain-gtk/meson.build index c3b579a..680b132 100644 --- a/champlain-gtk/meson.build +++ b/champlain-gtk/meson.build @@ -7,11 +7,14 @@ libchamplain_gtk_sources = [ 'gtk-champlain-embed.c', ] -libchamplain_gtk_deps = [ - glib_dep, - gobject_dep, +libchamplain_gtk_requires = [ gtk_dep, clutter_gtk_dep, +] + +libchamplain_gtk_deps = libchamplain_gtk_requires + [ + glib_dep, + gobject_dep, libchamplain_dep, ] @@ -103,7 +106,7 @@ endif libchamplain_gtk_dep = declare_dependency( link_with: libchamplain_gtk_sha, include_directories: rootdir, - dependencies: libchamplain_gtk_deps, + dependencies: libchamplain_gtk_requires + [libchamplain_dep], sources: libchamplain_gtk_dep_sources, ) @@ -112,4 +115,5 @@ libchamplain_gtk_pc = pkg.generate( description: 'Gtk+ Widget wrapper for libchamplain', subdirs: package_string, install_dir: pkgconfigdir, + requires: libchamplain_gtk_requires + [libchamplain_sha], ) diff --git a/champlain/meson.build b/champlain/meson.build index badb863..1076af6 100644 --- a/champlain/meson.build +++ b/champlain/meson.build @@ -85,13 +85,16 @@ if build_with_memphis ] endif -libchamplain_deps = [ - libm_dep, +libchamplain_requires = [ glib_dep, gobject_dep, - gio_dep, - clutter_dep, cairo_dep, + clutter_dep, +] + +libchamplain_deps = libchamplain_requires + [ + libm_dep, + gio_dep, sqlite_dep, libsoup_dep, ] @@ -246,7 +249,7 @@ endif libchamplain_dep = declare_dependency( link_with: libchamplain_sha, include_directories: rootdir, - dependencies: libchamplain_deps, + dependencies: libchamplain_requires, sources: libchamplain_dep_sources, ) @@ -256,4 +259,5 @@ libchamplain_pc = pkg.generate( description: 'Map View for Clutter', subdirs: package_string, install_dir: pkgconfigdir, + requires: libchamplain_requires, ) diff --git a/demos/meson.build b/demos/meson.build index f34def6..cf852d1 100644 --- a/demos/meson.build +++ b/demos/meson.build @@ -1,23 +1,22 @@ libchamplain_demos = [ - ['minimal', 'minimal.c'], - ['launcher', ['launcher.c', 'markers.c']], - ['animated-marker', 'animated-marker.c'], - ['polygons', 'polygons.c'], - ['url-marker', 'url-marker.c'], - ['create_destroy_test', 'create-destroy-test.c'], + ['minimal', 'minimal.c', []], + ['launcher', ['launcher.c', 'markers.c'], []], + ['animated-marker', 'animated-marker.c', []], + ['polygons', 'polygons.c', []], + ['url-marker', 'url-marker.c', [libsoup_dep]], + ['create_destroy_test', 'create-destroy-test.c', []], ] foreach demo: libchamplain_demos demo_name = demo.get(0) demo_sources = demo.get(1) + demo_deps = demo.get(2) executable( demo_name, demo_sources, install: false, - dependencies: [ - libchamplain_dep, - ] + dependencies: demo_deps + [libchamplain_dep], ) endforeach |