Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-01 23:06:54 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

MacOS + CMake: restore use of OPTION_APPLE_X11 under MacOS 10.13

Browse Source 
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
This commit is contained in:
Manolo Gouy
2018-01-08 20:52:48 +00:00
parent c462635e88
commit 9f0e9ff813
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMake/options.cmake
+3
View File
@@ -434,6 +434,9 @@ if(OPTION_USE_XFT)
set(USE_XFT X11_Xft_FOUND) set(USE_XFT X11_Xft_FOUND)
list(APPEND FLTK_LDLIBS -lXft) list(APPEND FLTK_LDLIBS -lXft)
set(FLTK_XFT_FOUND TRUE) 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() else()
set(FLTK_XFT_FOUND FALSE) set(FLTK_XFT_FOUND FALSE)
endif(OPTION_USE_XFT) endif(OPTION_USE_XFT)
CMake/setup.cmake
+4
View File
@@ -105,6 +105,10 @@ if(APPLE)
if(OPTION_APPLE_X11) if(OPTION_APPLE_X11)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -U__APPLE__") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -U__APPLE__")
set(CMAKE_C_FLAGS "${CMAKE_C_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) elseif(OPTION_APPLE_SDL)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SDL2_INCLUDE_DIRS} -U__APPLE__ -DFL_PORTING") 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") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SDL2_INCLUDE_DIRS} -U__APPLE__ -DFL_PORTING")