From 55c31c8b38aeb4e74a02219dd4243f505a11ff96 Mon Sep 17 00:00:00 2001 From: Magnus Jacobsson Date: Sun, 9 Jan 2022 12:28:42 +0100 Subject: [PATCH] CMake: ensure PangoCairo is found on MinGW This makes the PNG format available in CMake builds with MinGW. --- CHANGELOG.md | 1 + cmake/FindPangoCairo.cmake | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c80662d1c..81ed0589e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Building from scratch with Visual Studio fails #2175 - Plugins are not configured on MinGW #2176 - gvpr on MinGW does not support absolute paths #1780 +- PNG format not available in CMake builds with MinGW ## [2.50.0] – 2021-12-04 diff --git a/cmake/FindPangoCairo.cmake b/cmake/FindPangoCairo.cmake index 3bc002e6d..df57a455c 100644 --- a/cmake/FindPangoCairo.cmake +++ b/cmake/FindPangoCairo.cmake @@ -3,7 +3,7 @@ include(FindPackageHandleStandardArgs) if(WIN32) find_path(PangoCairo_INCLUDE_DIR pango/pangocairo.h PATH_SUFFIXES pango-1.0) find_path(GLIB_INCLUDE_DIR glib.h PATH_SUFFIXES glib-2.0) - find_path(GLIBCONFIG_INCLUDE_DIR glibconfig.h PATH_SUFFIXES glib-2.0/include) + find_path(GLIBCONFIG_INCLUDE_DIR glibconfig.h PATH_SUFFIXES glib-2.0/include lib/glib-2.0/include) find_path(HARFBUZZ_INCLUDE_DIR hb.h PATH_SUFFIXES harfbuzz) find_library(GLIB_LIBRARY NAMES glib-2.0) @@ -12,13 +12,13 @@ if(WIN32) find_library(PangoCairo_LIBRARY NAMES pangocairo-1.0) find_library(HARFBUZZ_LIBRARY NAMES harfbuzz) - find_program(GLIB_RUNTIME_LIBRARY NAMES glib-2.dll) - find_program(GOBJECT_RUNTIME_LIBRARY NAMES gobject-2.dll) + find_program(GLIB_RUNTIME_LIBRARY NAMES glib-2.dll libglib-2.0-0.dll) + find_program(GOBJECT_RUNTIME_LIBRARY NAMES gobject-2.dll libgobject-2.0-0.dll) find_program(HARFBUZZ_RUNTIME_LIBRARY NAMES libharfbuzz-0.dll) - find_program(PANGO_RUNTIME_LIBRARY NAMES pango-1.dll) - find_program(PangoCairo_RUNTIME_LIBRARY NAMES pangocairo-1.dll) - find_program(PANGOFT_RUNTIME_LIBRARY NAMES pangoft2-1.dll) - find_program(PANGOWIN_RUNTIME_LIBRARY NAMES pangowin32-1.dll) + find_program(PANGO_RUNTIME_LIBRARY NAMES pango-1.dll libpango-1.0-0.dll) + find_program(PangoCairo_RUNTIME_LIBRARY NAMES pangocairo-1.dll libpangocairo-1.0-0.dll) + find_program(PANGOFT_RUNTIME_LIBRARY NAMES pangoft2-1.dll libpangoft2-1.0-0.dll) + find_program(PANGOWIN_RUNTIME_LIBRARY NAMES pangowin32-1.dll libpangowin32-1.0-0.dll) find_package_handle_standard_args(PangoCairo DEFAULT_MSG GLIB_INCLUDE_DIR -- 2.40.0