From 8c6f1b8ece078a079aaa018c91085db92d63646c Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Wed, 30 Oct 2019 18:57:47 +0100 Subject: Restore CMake support of Darwin + XQuartz + fink --- CMake/options.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMake/options.cmake b/CMake/options.cmake index 93f33e834..4a0c5c2a2 100644 --- a/CMake/options.cmake +++ b/CMake/options.cmake @@ -467,8 +467,10 @@ endif (OPTION_USE_PANGO) if(X11_Xft_FOUND AND OPTION_USE_PANGO) #this covers Debian, Ubuntu, FreeBSD, NetBSD, Darwin if(APPLE AND OPTION_APPLE_X11) - list(APPEND CMAKE_INCLUDE_PATH /sw/include) - list(APPEND CMAKE_LIBRARY_PATH /sw/lib) + find_file(FINK_PREFIX NAMES /opt/sw /sw) + list(APPEND CMAKE_INCLUDE_PATH ${FINK_PREFIX}/include) + list(APPEND CMAKE_LIBRARY_PATH /${FINK_PREFIX}/lib) + list (APPEND FLTK_CXXFLAGS "-stdlib=libc++") endif(APPLE AND OPTION_APPLE_X11) find_file(HAVE_PANGO_H pango-1.0/pango/pango.h ${CMAKE_INCLUDE_PATH}) find_file(HAVE_PANGOXFT_H pango-1.0/pango/pangoxft.h ${CMAKE_INCLUDE_PATH}) -- cgit v1.2.3