diff options
| author | Pierre Ossman <ossman@cendio.se> | 2014-08-22 11:54:35 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2014-08-22 11:54:35 +0000 |
| commit | 936e4ca511be553db4676b34996b618de7069124 (patch) | |
| tree | 15877c89cf290f83f9dad7c8676b83c8d90fa912 /src | |
| parent | 1af2035e91250972d2f21829f1beef300e8ddd13 (diff) | |
Only link with fontconfig if Xft is used
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 52ce00b87..afacb823c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -253,12 +253,11 @@ endif(HAVE_XCURSOR) if(USE_XFT) target_link_libraries(fltk ${X11_Xft_LIB}) + if(LIB_fontconfig) + target_link_libraries(fltk ${LIB_fontconfig}) + endif(LIB_fontconfig) endif(USE_XFT) -if(LIB_fontconfig) - target_link_libraries(fltk ${LIB_fontconfig}) -endif(LIB_fontconfig) - ####################################################################### add_library(fltk_forms STATIC ${FLCPPFILES}) target_link_libraries(fltk_forms fltk) @@ -367,12 +366,11 @@ endif(HAVE_XINERAMA) if(USE_XFT) target_link_libraries(fltk_SHARED ${X11_Xft_LIB}) + if(LIB_fontconfig) + target_link_libraries(fltk_SHARED ${LIB_fontconfig}) + endif(LIB_fontconfig) endif(USE_XFT) -if(LIB_fontconfig) - target_link_libraries(fltk_SHARED ${LIB_fontconfig}) -endif(LIB_fontconfig) - ####################################################################### add_library(fltk_forms_SHARED SHARED ${FLCPPFILES}) target_link_libraries(fltk_forms_SHARED fltk_SHARED) |