Skip to content

Improve build experience in regards to Cairo/PangoCairo

Chun-wei Fan requested to merge cairo-detection-improvements into master

Hi,

This MR is opened to improve the build experience in regards to Cairo, on MSVC builds mainly, namely to:

  • Ensure that pangocairo.pc is generated correctly. If we found Cairo manually using headers and .lib's on MSVC builds, the "requires:" field should only contain pango, and the libs.private already contains -lcairo. This will ensure that we don't get broken build files when we build items that depend on PangoCairo, in particular those that make use of Meson.

  • Only use the fallback dependency for Cairo if we are sure that we didn't find the headers and .lib's, as applicable, after looking for Cairo's pkg-config file(s).

With blessings, thank you!

Merge request reports