--- a/CMake/options.cmake +++ b/CMake/options.cmake @@ -878,21 +878,26 @@ if((X11_Xft_FOUND OR NOT USE_PANGOXFT) A endif(USE_PANGOXFT) list(APPEND FLTK_BUILD_INCLUDE_DIRECTORIES ${CAIRO_INCLUDE_DIRS}) - find_library(HAVE_LIB_PANGO pango-1.0 ${CMAKE_LIBRARY_PATH}) + find_library(HAVE_LIB_PANGO pango-1.0 ${CMAKE_LIBRARY_PATH} + HINTS ${PANGOCAIRO_LIBRARY_DIRS} ${PANGOXFT_LIBRARY_DIRS} ${CAIRO_LIBRARY_DIRS}) mark_as_advanced(HAVE_LIB_PANGO) if(USE_PANGOXFT) - find_library(HAVE_LIB_PANGOXFT pangoxft-1.0 ${CMAKE_LIBRARY_PATH}) + find_library(HAVE_LIB_PANGOXFT pangoxft-1.0 ${CMAKE_LIBRARY_PATH} + HINTS ${PANGOCAIRO_LIBRARY_DIRS} ${PANGOXFT_LIBRARY_DIRS} ${CAIRO_LIBRARY_DIRS}) mark_as_advanced(HAVE_LIB_PANGOXFT) endif(USE_PANGOXFT) - find_library(HAVE_LIB_PANGOCAIRO pangocairo-1.0 ${CMAKE_LIBRARY_PATH}) + find_library(HAVE_LIB_PANGOCAIRO pangocairo-1.0 ${CMAKE_LIBRARY_PATH} + HINTS ${PANGOCAIRO_LIBRARY_DIRS} ${PANGOXFT_LIBRARY_DIRS} ${CAIRO_LIBRARY_DIRS}) mark_as_advanced(HAVE_LIB_PANGOCAIRO) - find_library(HAVE_LIB_CAIRO cairo ${CMAKE_LIBRARY_PATH}) + find_library(HAVE_LIB_CAIRO cairo ${CMAKE_LIBRARY_PATH} + HINTS ${PANGOCAIRO_LIBRARY_DIRS} ${PANGOXFT_LIBRARY_DIRS} ${CAIRO_LIBRARY_DIRS}) mark_as_advanced(HAVE_LIB_CAIRO) - find_library(HAVE_LIB_GOBJECT gobject-2.0 ${CMAKE_LIBRARY_PATH}) + find_library(HAVE_LIB_GOBJECT gobject-2.0 ${CMAKE_LIBRARY_PATH} + HINTS ${PANGOCAIRO_LIBRARY_DIRS} ${PANGOXFT_LIBRARY_DIRS} ${CAIRO_LIBRARY_DIRS}) mark_as_advanced(HAVE_LIB_GOBJECT) set(USE_PANGO TRUE)