commit 1ace96e470731c52500ece83021cc645c8de208b
Author:     ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
AuthorDate: Wed Aug 26 21:37:26 2020 +0200
Commit:     ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
CommitDate: Wed Aug 26 21:37:36 2020 +0200

    Fix for cmake-based construction of the fltk-config script under macOS.
    
    This also supports OPTION_APPLE_X11 and OPTION_USE_PANGO.

 CMake/options.cmake | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git CMake/options.cmake CMake/options.cmake
index 0bb2e87..3ea045e 100644
--- CMake/options.cmake
+++ CMake/options.cmake
@@ -56,6 +56,7 @@ endif (UNIX)
 if (APPLE)
   option (OPTION_APPLE_X11 "use X11" OFF)
   option (OPTION_APPLE_SDL "use SDL" OFF)
+  list (APPEND FLTK_CFLAGS "-isysroot ${CMAKE_OSX_SYSROOT}")
 endif (APPLE)
 
 # find X11 libraries and headers
@@ -73,12 +74,17 @@ if ((NOT APPLE OR OPTION_APPLE_X11) AND NOT WIN32)
 endif ((NOT APPLE OR OPTION_APPLE_X11) AND NOT WIN32)
 
 if (OPTION_APPLE_X11)
+  if (${CMAKE_SYSTEM_VERSION} VERSION_GREATER 16.9.0)
+    list (APPEND FLTK_CFLAGS "-D_LIBCPP_HAS_THREAD_API_PTHREAD")
+  endif (${CMAKE_SYSTEM_VERSION} VERSION_GREATER 16.9.0)
   include_directories (AFTER SYSTEM /opt/X11/include/freetype2)
   if (PATH_TO_XLIBS)
     set (LDFLAGS "-L${PATH_TO_XLIBS} ${LDFLAGS}")
   endif (PATH_TO_XLIBS)
   if (X11_INCLUDE_DIR)
-    list (APPEND FLTK_CFLAGS "-I${X11_INCLUDE_DIR}")
+    set (TEMP_INCLUDE_DIR ${X11_INCLUDE_DIR})
+    list (TRANSFORM TEMP_INCLUDE_DIR PREPEND "-I")
+    list (APPEND FLTK_CFLAGS "${TEMP_INCLUDE_DIR}")
   endif (X11_INCLUDE_DIR)
 endif (OPTION_APPLE_X11)
 
@@ -461,6 +467,10 @@ if (X11_Xft_FOUND AND OPTION_USE_PANGO)
     find_library(HAVE_LIB_PANGOXFT pangoxft-1.0 ${CMAKE_LIBRARY_PATH})
     set (USE_PANGO TRUE)
     list (APPEND FLTK_LDLIBS -lpango-1.0 -lpangoxft-1.0 -lgobject-2.0)
+    if (APPLE)
+      get_filename_component(PANGO_L_PATH ${HAVE_LIB_PANGO} PATH)
+      set (LDFLAGS "${LDFLAGS} -isysroot ${CMAKE_OSX_SYSROOT} -L${PANGO_L_PATH}")
+    endif (APPLE)
   else(PANGOXFT_FOUND)
 
   # this covers Debian, Ubuntu, FreeBSD, NetBSD, Darwin
@@ -497,9 +507,6 @@ if (X11_Xft_FOUND AND OPTION_USE_PANGO)
     endif (NOT GLIB_H_PATH)
     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)
-    if (APPLE)
-      set (LDFLAGS "${LDFLAGS} -L${FINK_PREFIX}/lib")
-    endif (APPLE)
   endif (HAVE_LIB_PANGO AND HAVE_LIB_PANGOXFT AND HAVE_LIB_GOBJECT)
 endif (PANGOXFT_FOUND)
 endif (X11_Xft_FOUND AND OPTION_USE_PANGO)