diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-10-14 14:13:49 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-10-14 14:13:49 +0000 |
| commit | c7e6f369079f60311cf241e8e05f4cd92f7c344b (patch) | |
| tree | 98b1f48aede68fd4f0846785f069d1fb84b4a5d1 /pango | |
| parent | 98566c9a4825513bb72f981ef347c1b3a56ac42d (diff) | |
| parent | 8bb28bab74ac9c9e0c5012ad17c520e38ab5bd83 (diff) | |
| download | pango-c7e6f369079f60311cf241e8e05f4cd92f7c344b.tar.gz | |
Merge branch 'override-dependency' into 'master'
meson: Use meson.override_dependency()
See merge request GNOME/pango!250
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/meson.build | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pango/meson.build b/pango/meson.build index 0b87b644..91261274 100644 --- a/pango/meson.build +++ b/pango/meson.build @@ -152,6 +152,7 @@ libpango_dep = declare_dependency( dependencies: pango_deps, sources: pango_dep_sources, ) +meson.override_dependency('pango', libpango_dep) pango_pkg_requires = ['gobject-2.0'] if harfbuzz_dep.type_name() == 'pkgconfig' @@ -293,6 +294,7 @@ if build_pangoft2 dependencies: pango_deps + [ libpango_dep ], sources: pangoft2_dep_sources, ) + meson.override_dependency('pangoft2', libpangoft2_dep) pkgconfig.generate(libpangoft2, name: 'Pango FT2 and Pango Fc', @@ -382,6 +384,7 @@ if xft_dep.found() and fontconfig_dep.found() dependencies: pango_deps + [ libpango_dep, libpangoft2_dep ], sources: pangoxft_dep_sources, ) + meson.override_dependency('pangoxft', libpangoxft_dep) pkgconfig.generate(libpangoxft, name: 'Pango Xft', @@ -441,6 +444,7 @@ if host_system == 'windows' include_directories: root_inc, dependencies: pango_deps + [ libpango_dep ], ) + meson.override_dependency('pangowin32', libpangowin32_dep) pkgconfig.generate(libpangowin32, name: 'Pango Win32', @@ -547,6 +551,7 @@ if cairo_dep.found() dependencies: pango_deps + [ libpango_dep ], sources: pangocairo_dep_sources, ) + meson.override_dependency('pangocairo', libpangocairo_dep) # Create pangocairo.pc according to whether we found Cairo # manually |