diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-01-13 18:50:10 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-01-13 18:50:10 +0000 |
| commit | bd88b04815d097678fc5954a6a429433b59e768e (patch) | |
| tree | 8691b506db3ec6a452d4f73ba1ca04d1251084cc | |
| parent | 97c9b4e784a287ac2c7c9cae1e4db0cab3a28dab (diff) | |
| parent | 78dbeb8d04cf5ad12393e18ec037e1a9a49045da (diff) | |
| download | pango-bd88b04815d097678fc5954a6a429433b59e768e.tar.gz | |
Merge branch 'dab_fix_gir_subproject' into 'master'
meson: add harfbuzz gobject dependency
See merge request GNOME/pango!271
| -rw-r--r-- | pango/meson.build | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pango/meson.build b/pango/meson.build index 91261274..15386661 100644 --- a/pango/meson.build +++ b/pango/meson.build @@ -128,7 +128,11 @@ if build_gir gir_args = [ '--quiet', ] - + harfbuzz_gobject_dep = dependency('harfbuzz-gobject', version: harfbuzz_req_version, required: false, + fallback: ['harfbuzz', 'libharfbuzz_gobject_dep']) + if harfbuzz_gobject_dep.found() + pango_deps += harfbuzz_gobject_dep + endif pango_gir = gnome.generate_gir( libpango, sources: pango_sources + pango_headers + [ pango_enum_h ], @@ -137,6 +141,7 @@ if build_gir identifier_prefix: 'Pango', symbol_prefix: 'pango', export_packages: 'pango', + dependencies: pango_deps, includes: [ 'HarfBuzz-0.0', 'GObject-2.0', 'cairo-1.0', ], header: 'pango/pango.h', install: true, |