[pango/msvc.improvements: 5/5] meson: Fix pkg-config file generation for HarfBuzz
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango/msvc.improvements: 5/5] meson: Fix pkg-config file generation for HarfBuzz
- Date: Fri, 5 Jun 2020 10:00:22 +0000 (UTC)
commit 45b5780f2aaa9b1421b27721dd7b296ffb6fd8c5
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Wed Jan 15 15:17:16 2020 +0800
meson: Fix pkg-config file generation for HarfBuzz
HarfBuzz may be found manually instead of via pkg-config, so only add it to
Pango's pkg-config file if it is really found via pkg-config.
pango/meson.build | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/pango/meson.build b/pango/meson.build
index 738bd36c..b2496373 100644
--- a/pango/meson.build
+++ b/pango/meson.build
@@ -152,11 +152,16 @@ libpango_dep = declare_dependency(
sources: pango_dep_sources,
)
+pango_pkg_requires = ['gobject-2.0']
+if harfbuzz_dep.type_name() == 'pkgconfig'
+ pango_pkg_requires += 'harfbuzz'
+endif
+
pkgconfig.generate(libpango,
name: 'Pango',
description: 'Internationalized text handling',
version: meson.project_version(),
- requires: ['gobject-2.0', 'harfbuzz'],
+ requires: pango_pkg_requires,
filebase: 'pango',
subdirs: pango_api_name,
install_dir: join_paths(pango_libdir, 'pkgconfig'),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]