Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-29 04:26:27 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Only link with fontconfig if Xft is used

Browse Source 
This matches what the autoconf stuff does. It is also crucial
on OS X where linking against fontconfig can fool the system into
believing that FLTK requires X11, prompting the installation of
XQuartz.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10244 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Pierre Ossman
2014-08-22 11:54:35 +00:00
parent 1af2035e91
commit 936e4ca511
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CMakeLists.txt
+6 -8
View File
@@ -253,12 +253,11 @@ endif(HAVE_XCURSOR)
if(USE_XFT) if(USE_XFT)
target_link_libraries(fltk ${X11_Xft_LIB}) target_link_libraries(fltk ${X11_Xft_LIB})
if(LIB_fontconfig)
target_link_libraries(fltk ${LIB_fontconfig})
endif(LIB_fontconfig)
endif(USE_XFT) endif(USE_XFT)
if(LIB_fontconfig)
target_link_libraries(fltk ${LIB_fontconfig})
endif(LIB_fontconfig)
####################################################################### #######################################################################
add_library(fltk_forms STATIC ${FLCPPFILES}) add_library(fltk_forms STATIC ${FLCPPFILES})
target_link_libraries(fltk_forms fltk) target_link_libraries(fltk_forms fltk)
@@ -367,12 +366,11 @@ endif(HAVE_XINERAMA)
if(USE_XFT) if(USE_XFT)
target_link_libraries(fltk_SHARED ${X11_Xft_LIB}) target_link_libraries(fltk_SHARED ${X11_Xft_LIB})
if(LIB_fontconfig)
target_link_libraries(fltk_SHARED ${LIB_fontconfig})
endif(LIB_fontconfig)
endif(USE_XFT) endif(USE_XFT)
if(LIB_fontconfig)
target_link_libraries(fltk_SHARED ${LIB_fontconfig})
endif(LIB_fontconfig)
####################################################################### #######################################################################
add_library(fltk_forms_SHARED SHARED ${FLCPPFILES}) add_library(fltk_forms_SHARED SHARED ${FLCPPFILES})
target_link_libraries(fltk_forms_SHARED fltk_SHARED) target_link_libraries(fltk_forms_SHARED fltk_SHARED)