From c82165cb074b39b63f3e0d873902d76fc4615292 Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Mon, 9 Dec 2024 09:21:24 +0100 Subject: No need to link to libgtk when using package libdecor-0-dev --- CMake/options.cmake | 4 ++-- README.CMake.txt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMake/options.cmake b/CMake/options.cmake index cabdf4e6b..eac34b9e6 100644 --- a/CMake/options.cmake +++ b/CMake/options.cmake @@ -970,7 +970,7 @@ endif((X11_Xft_FOUND OR NOT USE_PANGOXFT) AND FLTK_USE_PANGO) if(FLTK_BACKEND_WAYLAND) # Note: Disable FLTK_USE_LIBDECOR_GTK to get cairo titlebars rather than GTK - if(FLTK_USE_LIBDECOR_GTK) + if(FLTK_USE_LIBDECOR_GTK AND NOT USE_SYSTEM_LIBDECOR) pkg_check_modules(GTK IMPORTED_TARGET gtk+-3.0) if(GTK_FOUND) list(APPEND FLTK_BUILD_INCLUDE_DIRECTORIES ${GTK_INCLUDE_DIRS}) @@ -978,7 +978,7 @@ if(FLTK_BACKEND_WAYLAND) message(WARNING "Installation of the development files for the GTK library " "(e.g., libgtk-3-dev) is recommended when using the gnome desktop.") endif(GTK_FOUND) - endif(FLTK_USE_LIBDECOR_GTK) + endif(FLTK_USE_LIBDECOR_GTK AND NOT USE_SYSTEM_LIBDECOR) endif() diff --git a/README.CMake.txt b/README.CMake.txt index cc96899c0..7d260b31a 100644 --- a/README.CMake.txt +++ b/README.CMake.txt @@ -260,9 +260,9 @@ FLTK_OPTION_SVG - default ON Turning this option off disables SVG (read and write) support. FLTK_USE_LIBDECOR_GTK - default ON (Wayland only). - Allow to use libdecor's GTK plugin to draw window titlebars. Otherwise - FLTK does not use GTK and apps will not need linking to GTK. This feature - is always 'ON' if FLTK_USE_SYSTEM_LIBDECOR is 'ON'. + Meaningful only under Wayland and if FLTK_USE_SYSTEM_LIBDECOR is 'OFF'. + Allows to use libdecor's GTK plugin to draw window titlebars. Otherwise + FLTK does not use GTK and apps will not need linking to GTK. FLTK_USE_PANGO - default OFF (see note below) This option is highly recommended under X11 if FLTK is expected to draw -- cgit v1.2.3