From 43ab34df054a81fdd0d75108ee708986435274a4 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sat, 20 Apr 2024 19:49:04 +0200 Subject: [PATCH] CMake build summary: output libdecor location if found Wayland only: output either the libdecor location or "Bundled". --- CMake/fl_summary.cmake | 2 +- CMakeLists.txt | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/CMake/fl_summary.cmake b/CMake/fl_summary.cmake index 33490a0c6..311a0db63 100644 --- a/CMake/fl_summary.cmake +++ b/CMake/fl_summary.cmake @@ -79,7 +79,7 @@ endmacro(fl_summary_yn title var) ######################################################################## macro(fl_summary_image title name lib) - fl_expand_name(name4 "${name}" 4) + fl_expand_name(name4 "${name}" 8) if(FLTK_USE_BUNDLED_${name}) set(value "${name4} = Bundled") else() diff --git a/CMakeLists.txt b/CMakeLists.txt index 5041d16af..be0ede666 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -264,9 +264,17 @@ fl_summary("Installation prefix" "${CMAKE_INSTALL_PREFIX}") message("") # "title" name system library if used -fl_summary_image("Image Libraries" JPEG LIB_jpeg) -fl_summary_image("" PNG LIB_png) -fl_summary_image("" ZLIB LIB_zlib) +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(USE_SYSTEM_LIBDECOR) + fl_summary("" "Libdecor = System: ${SYSTEM_LIBDECOR_LINK_LIBRARIES}") + else() + fl_summary("" "Libdecor = Bundled") + endif() +endif(FLTK_BACKEND_WAYLAND) message("") @@ -278,7 +286,6 @@ if(UNIX AND NOT (APPLE AND NOT FLTK_BACKEND_X11)) else() fl_summary("Use Wayland" "Yes (cannot run as X11 client)") endif(FLTK_BACKEND_X11) - fl_summary_yn("Use system libdecor" USE_SYSTEM_LIBDECOR) else() fl_summary("Use Wayland" "No (X11 is used)") endif(FLTK_BACKEND_WAYLAND)