diff options
author | Matthias Clasen <mclasen@redhat.com> | 2019-07-09 21:22:41 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2019-07-09 22:37:37 -0400 |
commit | 8b85815f1b122842d915e7fc29cc68d228a64dbb (patch) | |
tree | 87729701b1f58485f8aa79e47be9f4ce0223c202 | |
parent | f972ba0562823a8d55ad02ff9609481a884c79f8 (diff) | |
download | pango-8b85815f1b122842d915e7fc29cc68d228a64dbb.tar.gz |
Move pangofc to libpango
Move the fontconfig+harfbuzz using parts to libpango,
since we want to start using harfbuzz on all platforms.
-rw-r--r-- | pango/meson.build | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/pango/meson.build b/pango/meson.build index bcb5ad72..faf38780 100644 --- a/pango/meson.build +++ b/pango/meson.build @@ -56,6 +56,27 @@ pango_headers = [ 'pango-version-macros.h', ] +pango_requires = [ + 'gobject-2.0', +] + +if fontconfig_dep.found() + pango_headers += [ + 'pangofc-font.h', + 'pangofc-fontmap.h', + 'pangofc-decoder.h', + ] + pango_sources += [ + 'pangofc-font.c', + 'pangofc-fontmap.c', + 'pangofc-decoder.c', + 'pangofc-shape.c', + ] + pango_requires += [ + fontconfig_pc, + ] +endif + install_headers(pango_headers, subdir: pango_api_path) # Features header @@ -155,7 +176,7 @@ pkgconfig.generate(libpango, name: 'Pango', description: 'Internationalized text handling', version: meson.project_version(), - requires: ['gobject-2.0'], + requires: pango_requires, filebase: 'pango', subdirs: pango_api_name, install_dir: join_paths(pango_libdir, 'pkgconfig'), @@ -165,17 +186,10 @@ pkgconfig.generate(libpango, if build_pangoft2 pangoft2_headers = [ 'pango-ot.h', - 'pangofc-font.h', - 'pangofc-fontmap.h', - 'pangofc-decoder.h', 'pangoft2.h', ] pangoft2_public_sources = [ - 'pangofc-font.c', - 'pangofc-fontmap.c', - 'pangofc-decoder.c', - 'pangofc-shape.c', 'pangoft2.c', ] |