[pango/cairo-detection-improvements: 1/2] pango/meson.build: Fix pangocairo.pc on MSVC builds
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango/cairo-detection-improvements: 1/2] pango/meson.build: Fix pangocairo.pc on MSVC builds
- Date: Fri, 19 Jul 2019 10:26:30 +0000 (UTC)
commit 039f842773df8e5cb56c8840d2741bbc321a3ed7
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri Jul 19 18:15:12 2019 +0800
pango/meson.build: Fix pangocairo.pc on MSVC builds
On MSVC builds, Cairo may be found either via pkg-config files or
manually through finding headers and libs, so we need to ensure that we
create pangocairo.pc correctly, otherwise items that depend on
PangoCairo may not link correctly.
pango/meson.build | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
---
diff --git a/pango/meson.build b/pango/meson.build
index cfbf8a9a..e47fded2 100644
--- a/pango/meson.build
+++ b/pango/meson.build
@@ -490,13 +490,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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]