diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2019-07-21 00:40:36 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2019-07-21 00:40:36 +0000 |
| commit | 9f217e7f93f63bf1ee26e23dd978e1729461b9b1 (patch) | |
| tree | e9962be556bdaa614aa8b841d2f10ffd88c9b622 /meson.build | |
| parent | f14969a988e1afb0830e0e05206800deee1ab777 (diff) | |
| parent | 77e77bcf8897a58cd29a44ce1ce85e99ac28635b (diff) | |
| download | pango-9f217e7f93f63bf1ee26e23dd978e1729461b9b1.tar.gz | |
Merge branch 'cairo-detection-improvements' into 'master'
Improve build experience in regards to Cairo/PangoCairo
See merge request GNOME/pango!93
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 13d9bbff..519251f2 100644 --- a/meson.build +++ b/meson.build @@ -343,8 +343,7 @@ if host_system == 'darwin' endif cairo_found_type = '' -cairo_dep = dependency('cairo', version: cairo_req_version, required: false, - fallback: ['cairo', 'libcairo_dep']) +cairo_dep = dependency('cairo', version: cairo_req_version, required: false) if cairo_dep.found() cairo_found_type = cairo_dep.type_name() @@ -355,6 +354,14 @@ else endif endif +# Remove once Meson gains capability to declare dependencies +# in a declarative way +if not cairo_dep.found() + cairo_dep = dependency('cairo', version: cairo_req_version, + fallback: ['cairo', 'libcairo_dep']) + cairo_found_type = cairo_dep.type_name() +endif + pango_font_backends = [] pango_cairo_backends = [] |