From 260a446609b7638669fa97afb393f3993106b6ac Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Sun, 16 Oct 2022 08:29:59 +0200 Subject: macOS + homebrew: restore building with CMake's OPTION_APPLE_X11 These option combinations work: -DOPTION_APPLE_X11 -DOPTION_APPLE_X11 -DOPTION_USE_CAIRO But -DOPTION_APPLE_X11 -DOPTION_USE_PANGO is not possible because homebrew doesn't provide the pangoxft package. --- src/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ab5188ece..c5aa97a50 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -611,8 +611,11 @@ endif (HAVE_XRENDER) if (USE_PANGO) ### FIXME ### This needs to use the PKG_* variables directly - list (APPEND OPTIONAL_LIBS ${HAVE_LIB_PANGO} ${HAVE_LIB_PANGOXFT} ${HAVE_LIB_PANGOCAIRO}) + list (APPEND OPTIONAL_LIBS ${HAVE_LIB_PANGO} ${HAVE_LIB_PANGOCAIRO}) list (APPEND OPTIONAL_LIBS ${HAVE_LIB_CAIRO} ${HAVE_LIB_GOBJECT}) + if (USE_PANGOXFT) + list (APPEND OPTIONAL_LIBS ${HAVE_LIB_PANGOXFT}) + endif (USE_PANGOXFT) endif (USE_PANGO) if (USE_XFT) -- cgit v1.2.3