mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Continue CMake support of the Darwin+XQuartz+fink test platform

Browse Source
This commit is contained in:
ManoloFLTK 2019-10-31 07:30:39 +01:00
parent 031a7a8414
commit 9ff6ad7885
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMake/options.cmake
View File

@ -469,8 +469,7 @@ if(X11_Xft_FOUND AND OPTION_USE_PANGO)
if(APPLE AND OPTION_APPLE_X11)
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++")
list(APPEND CMAKE_LIBRARY_PATH ${FINK_PREFIX}/lib)
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})
@ -501,7 +500,7 @@ if(X11_Xft_FOUND AND OPTION_USE_PANGO)
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/sw/lib")
set(LDFLAGS "${LDFLAGS} -L${FINK_PREFIX}/lib")
endif (APPLE)
endif(HAVE_LIB_PANGO AND HAVE_LIB_PANGOXFT AND HAVE_LIB_GOBJECT)
endif(X11_Xft_FOUND AND OPTION_USE_PANGO)