diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-08 15:28:37 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-05-09 10:38:18 (GMT) |
| commit | 5ab137b7e988db16ca7204e98869bca1b6442b25 (patch) | |
| tree | 6e919383ca48eb1715dac61067699fd89ad7e026 /Modules | |
| parent | 4c82f309c59d02899145bc25c0e9efc91a6f64ed (diff) | |
| download | CMake-5ab137b7e988db16ca7204e98869bca1b6442b25.zip CMake-5ab137b7e988db16ca7204e98869bca1b6442b25.tar.gz CMake-5ab137b7e988db16ca7204e98869bca1b6442b25.tar.bz2 | |
FindGTK2: Add harfbuzz target for dependency from pango
Since commit effafca77e (FindGTK2: Add harfbuzz to GTK2_INCLUDE_DIRS,
2019-10-01, v3.16.0-rc1~22^2), pango's dependency on harfbuzz has been
captured, but only for the `GTK2_INCLUDE_DIRS` and `GTK2_LIBRARIES`
variables. Add the `GTK2::harfbuzz` imported target and update the
`GTK2::pango` target to depend on it.
Issue: #19531
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindGTK2.cmake | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake index 83091f3..600e4aa 100644 --- a/Modules/FindGTK2.cmake +++ b/Modules/FindGTK2.cmake @@ -708,11 +708,14 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS}) _GTK2_FIND_LIBRARY (CAIRO cairo false false) _GTK2_ADD_TARGET (CAIRO) + _GTK2_FIND_INCLUDE_DIR(HARFBUZZ hb.h) + _GTK2_FIND_LIBRARY (HARFBUZZ harfbuzz false false) + _GTK2_ADD_TARGET (HARFBUZZ) + _GTK2_FIND_INCLUDE_DIR(PANGO pango/pango.h) _GTK2_FIND_LIBRARY (PANGO pango false true) - _GTK2_ADD_TARGET (PANGO GTK2_DEPENDS gobject glib) - - _GTK2_FIND_INCLUDE_DIR(HARFBUZZ hb.h) + _GTK2_ADD_TARGET (PANGO GTK2_DEPENDS gobject glib + GTK2_OPTIONAL_DEPENDS harfbuzz) _GTK2_FIND_LIBRARY (PANGOCAIRO pangocairo false true) _GTK2_ADD_TARGET (PANGOCAIRO GTK2_DEPENDS pango cairo gobject glib) |