diff options
Diffstat (limited to 'CMake/options.cmake')
| -rw-r--r-- | CMake/options.cmake | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/CMake/options.cmake b/CMake/options.cmake index ac7fa5bb6..2bb439ae6 100644 --- a/CMake/options.cmake +++ b/CMake/options.cmake @@ -463,18 +463,23 @@ endif (OPTION_USE_PANGO) ####################################################################### if (X11_Xft_FOUND AND OPTION_USE_PANGO) pkg_check_modules(PANGOXFT pangoxft) + pkg_check_modules(PANGOCAIRO pangocairo) + pkg_check_modules(CAIRO cairo) # message (STATUS "PANGOXFT_FOUND=" ${PANGOXFT_FOUND}) - if (PANGOXFT_FOUND) - include_directories (${PANGOXFT_INCLUDE_DIRS}) + if (PANGOXFT_FOUND AND PANGOCAIRO_FOUND AND CAIRO_FOUND) + include_directories (${PANGOXFT_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS}) find_library(HAVE_LIB_PANGO pango-1.0 ${CMAKE_LIBRARY_PATH}) find_library(HAVE_LIB_PANGOXFT pangoxft-1.0 ${CMAKE_LIBRARY_PATH}) + find_library(HAVE_LIB_PANGOCAIRO pangocairo-1.0 ${CMAKE_LIBRARY_PATH}) + find_library(HAVE_LIB_CAIRO cairo ${CMAKE_LIBRARY_PATH}) + find_library(HAVE_LIB_GOBJECT gobject-2.0 ${CMAKE_LIBRARY_PATH}) set (USE_PANGO TRUE) - list (APPEND FLTK_LDLIBS -lpango-1.0 -lpangoxft-1.0 -lgobject-2.0) + list (APPEND FLTK_LDLIBS -lpango-1.0 -lpangoxft-1.0 -lpangocairo-1.0 -lcairo -lgobject-2.0) if (APPLE) get_filename_component(PANGO_L_PATH ${HAVE_LIB_PANGO} PATH) set (LDFLAGS "${LDFLAGS} -L${PANGO_L_PATH}") endif (APPLE) - else(PANGOXFT_FOUND) + else(PANGOXFT_FOUND AND PANGOCAIRO_FOUND AND CAIRO_FOUND) # this covers Debian, Ubuntu, FreeBSD, NetBSD, Darwin if (APPLE AND OPTION_APPLE_X11) @@ -511,7 +516,7 @@ if (X11_Xft_FOUND AND OPTION_USE_PANGO) include_directories (${PANGO_H_PREFIX}/pango-1.0 ${GLIB_H_PATH} ${PANGOLIB_DIR}/glib-2.0/include) list (APPEND FLTK_LDLIBS -lpango-1.0 -lpangoxft-1.0 -lgobject-2.0) endif (HAVE_LIB_PANGO AND HAVE_LIB_PANGOXFT AND HAVE_LIB_GOBJECT) -endif (PANGOXFT_FOUND) +endif (PANGOXFT_FOUND AND PANGOCAIRO_FOUND AND CAIRO_FOUND) endif (X11_Xft_FOUND AND OPTION_USE_PANGO) if (OPTION_USE_XFT) |