diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-09 10:40:26 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-05-09 10:40:26 (GMT) |
| commit | 68f60c073f676b0cb343c3c0d98183a7ed3287a8 (patch) | |
| tree | b3f850cf161c8cbbb6fc84c7b80a49f4a98a0b51 /Modules | |
| parent | 6687a82000311b6038317d2ee1ff62c183683720 (diff) | |
| parent | 5ab137b7e988db16ca7204e98869bca1b6442b25 (diff) | |
| download | CMake-68f60c073f676b0cb343c3c0d98183a7ed3287a8.zip CMake-68f60c073f676b0cb343c3c0d98183a7ed3287a8.tar.gz CMake-68f60c073f676b0cb343c3c0d98183a7ed3287a8.tar.bz2 | |
Merge branch 'FindGTK2-harfbuzz-target' into release-3.16
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 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) |