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 | |
| 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
| -rw-r--r-- | meson.build | 11 | ||||
| -rw-r--r-- | pango/meson.build | 10 |
2 files changed, 18 insertions, 3 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 = [] diff --git a/pango/meson.build b/pango/meson.build index 1327ca39..c07b6bde 100644 --- a/pango/meson.build +++ b/pango/meson.build @@ -485,13 +485,21 @@ if cairo_dep.found() sources: pangocairo_dep_sources, ) + # Create pangocairo.pc according to whether we found Cairo + # manually + if ['pkgconfig', 'internal'].contains(cairo_found_type) + pango_cairo_requires = [ 'pango', cairo_pc ] + else + pango_cairo_requires = [ 'pango' ] + endif + pkgconfig.generate(libpangocairo, name: 'Pango Cairo', description: 'Cairo rendering support for Pango', version: meson.project_version(), filebase: 'pangocairo', subdirs: pango_api_name, - requires: [ 'pango', cairo_pc ], + requires: pango_cairo_requires, install_dir: join_paths(pango_libdir, 'pkgconfig'), ) else |