diff options
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/options.cmake | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/CMake/options.cmake b/CMake/options.cmake index 62b22a556..3a80aed90 100644 --- a/CMake/options.cmake +++ b/CMake/options.cmake @@ -287,7 +287,9 @@ if(UNIX) if(FLTK_BACKEND_WAYLAND) set(FLTK_USE_WAYLAND 1) - include(FindX11) + if(FLTK_BACKEND_X11) + include(FindX11) + endif() if(FLTK_BACKEND_X11 AND X11_FOUND) set(FLTK_USE_X11 1) # build a hybrid Wayland/X11 library else() @@ -299,7 +301,7 @@ if(UNIX) set(USE_SYSTEM_LIBDECOR 1) unset(FLTK_USE_XRENDER CACHE) unset(FLTK_USE_XINERAMA CACHE) - # unset(FLTK_USE_XFT CACHE) + unset(FLTK_USE_XFT CACHE) unset(FLTK_USE_XCURSOR CACHE) unset(FLTK_USE_XFIXES CACHE) if(X11_FOUND) @@ -860,11 +862,11 @@ if((X11_Xft_FOUND OR NOT USE_PANGOXFT) AND FLTK_USE_PANGO) list(REMOVE_DUPLICATES FLTK_LDLIBS) # *FIXME* Libraries should not be added explicitly if possible - if(FLTK_BACKEND_WAYLAND) + if(FLTK_BACKEND_WAYLAND AND FLTK_USE_LIBDECOR_GTK AND NOT USE_SYSTEM_LIBDECOR) list(APPEND FLTK_LDLIBS -lgtk-3 -lgdk-3 -lgio-2.0) - if(FLTK_BACKEND_X11) - list(APPEND FLTK_LDLIBS -lX11) - endif() + endif() + if(FLTK_BACKEND_X11) + list(APPEND FLTK_LDLIBS -lX11) endif() list(REMOVE_DUPLICATES FLTK_LDLIBS) |