From 3bc379bc4e159df66023ade31931133f7c78cb1f Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Wed, 28 May 2025 21:13:10 +0200 Subject: Fix usage of FLTK_BACKEND_WAYLAND and FLTK_USE_WAYLAND - Do not change or remove the cache variable FLTK_BACKEND_WAYLAND: this is an option set (and must only be changed) by the user. - CMake/options.cmake: check Wayland availability if option FLTK_BACKEND_WAYLAND is ON and set the result variable FLTK_USE_WAYLAND accordingly. - Replace FLTK_BACKEND_WAYLAND with FLTK_USE_WAYLAND everywhere else, except as noted above: in options.cmake. --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index aeec6dfa8..4a45b5cc1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,7 +114,7 @@ endif() # for instance if FLTK is built as a subproject (FetchContent) set(FLTK_VERSION ${FLTK_VERSION} CACHE STRING - "FLTK version: generated, do not change" FORCE) + "FLTK version: generated by CMake, do not change" FORCE) ####################################################################### # basic setup @@ -405,19 +405,19 @@ fl_summary_image("Bundled Libraries" JPEG LIB_jpeg) fl_summary_image("" PNG LIB_png) fl_summary_image("" ZLIB LIB_zlib) -if(FLTK_BACKEND_WAYLAND) +if(FLTK_USE_WAYLAND) if(USE_SYSTEM_LIBDECOR) fl_summary("" "Libdecor = System: ${SYSTEM_LIBDECOR_LINK_LIBRARIES}") else() fl_summary("" "Libdecor = Bundled") endif() -endif(FLTK_BACKEND_WAYLAND) +endif(FLTK_USE_WAYLAND) message("") if(UNIX AND NOT (APPLE AND NOT FLTK_BACKEND_X11)) - if(FLTK_BACKEND_WAYLAND) + if(FLTK_USE_WAYLAND) if(FLTK_BACKEND_X11) fl_summary("Use Wayland" "Yes (can also run as X11 client)") else() @@ -425,7 +425,7 @@ if(UNIX AND NOT (APPLE AND NOT FLTK_BACKEND_X11)) endif(FLTK_BACKEND_X11) else() fl_summary("Use Wayland" "No (X11 is used)") - endif(FLTK_BACKEND_WAYLAND) + endif(FLTK_USE_WAYLAND) fl_summary_yn("All drawing uses Cairo" FLTK_USE_CAIRO) -- cgit v1.2.3