diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-11 14:12:05 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-11 14:12:14 (GMT) |
| commit | 4de2cb4c41031868a6e02c83a58eacc00c4b84b5 (patch) | |
| tree | bb4e19d399322f8e4004f8b373d8c51b2ddc9404 /Modules | |
| parent | ccd604da2eb3e32b30ed470939c3084a8abd0d64 (diff) | |
| parent | 5ab137b7e988db16ca7204e98869bca1b6442b25 (diff) | |
| download | CMake-4de2cb4c41031868a6e02c83a58eacc00c4b84b5.zip CMake-4de2cb4c41031868a6e02c83a58eacc00c4b84b5.tar.gz CMake-4de2cb4c41031868a6e02c83a58eacc00c4b84b5.tar.bz2 | |
Merge topic 'FindGTK2-harfbuzz-target' into release-3.17
5ab137b7e9 FindGTK2: Add harfbuzz target for dependency from pango
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4725
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 565763d..62f1614 100644 --- a/Modules/FindGTK2.cmake +++ b/Modules/FindGTK2.cmake @@ -695,11 +695,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) |