From 9f0e9ff8138fcd1ee817fe144282513283b0e331 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Mon, 8 Jan 2018 20:52:48 +0000
Subject: MacOS + CMake: restore use of OPTION_APPLE_X11 under MacOS 10.13

It's necessary to compile with -mmacosx-version-min=10.8
and to link with -lfontconfig when Xft is used

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12627 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 CMake/options.cmake | 3 +++
 CMake/setup.cmake   | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/CMake/options.cmake b/CMake/options.cmake
index e93ba5bee..60e9fc0e0 100644
--- a/CMake/options.cmake
+++ b/CMake/options.cmake
@@ -434,6 +434,9 @@ if(OPTION_USE_XFT)
    set(USE_XFT X11_Xft_FOUND)
    list(APPEND FLTK_LDLIBS -lXft)
    set(FLTK_XFT_FOUND TRUE)
+   if(APPLE AND OPTION_APPLE_X11)
+     find_library(LIB_fontconfig fontconfig "/opt/X11/lib")
+   endif(APPLE AND OPTION_APPLE_X11)
 else()
    set(FLTK_XFT_FOUND FALSE)
 endif(OPTION_USE_XFT)
diff --git a/CMake/setup.cmake b/CMake/setup.cmake
index 4e3d82ab6..a31016dff 100644
--- a/CMake/setup.cmake
+++ b/CMake/setup.cmake
@@ -105,6 +105,10 @@ if(APPLE)
    if(OPTION_APPLE_X11)
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -U__APPLE__")
      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U__APPLE__")
+     if(${CMAKE_SYSTEM_VERSION} VERSION_GREATER 16.9.0)
+       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.8")
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.8")
+     endif(${CMAKE_SYSTEM_VERSION} VERSION_GREATER 16.9.0)
    elseif(OPTION_APPLE_SDL)
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SDL2_INCLUDE_DIRS} -U__APPLE__ -DFL_PORTING")
      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SDL2_INCLUDE_DIRS} -U__APPLE__ -DFL_PORTING")
-- 
cgit v1.2.3