diff options
author | Matthias Clasen <mclasen@redhat.com> | 2023-04-15 18:11:04 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2023-04-15 18:11:04 +0000 |
commit | 9b9e86629eae7c757a467d8c825c3929f27ebc3c (patch) | |
tree | 4409a5d0f30c62727ad9b315b52307caa444cbeb | |
parent | 818b549bafbaef9323ceedffb3930113ae008af7 (diff) | |
parent | fbdac1339637e058795e0ce83b3c16e8c4ec8939 (diff) | |
download | pango-9b9e86629eae7c757a467d8c825c3929f27ebc3c.tar.gz |
Merge branch 'fix-cairo-dwrite-font-dep' into 'main'
Fix check for Cairo DWrite Font dependency
Closes gtk#5752
See merge request GNOME/pango!687
-rw-r--r-- | meson.build | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meson.build b/meson.build index fcd0bee8..930f4108 100644 --- a/meson.build +++ b/meson.build @@ -363,7 +363,11 @@ cairo_dwrite_dep = disabler() # Only for Windows if cairo_dep.found() cairo_found_type = cairo_dep.type_name() if host_system == 'windows' - cairo_dwrite_dep = dependency('cairo-win32-dwrite-font', version: cairo_req_version, required: false) + cairo_dwrite_dep = dependency('cairo-dwrite-font', version: cairo_req_version, required: false) + # cairo < 1.17.8 used a different name + if not cairo_dwrite_dep.found() + cairo_dwrite_dep = dependency('cairo-win32-dwrite-font', version: cairo_req_version, required: false) + endif endif else if cc.get_id() == 'msvc' and cc.has_header('cairo.h') |