|
|
commit 43ab34df054a81fdd0d75108ee708986435274a4
Author: Albrecht Schlosser <albrechts.fltk@online.de>
AuthorDate: Sat Apr 20 19:49:04 2024 +0200
Commit: Albrecht Schlosser <albrechts.fltk@online.de>
CommitDate: Sat Apr 20 19:49:04 2024 +0200
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 CMake/fl_summary.cmake CMake/fl_summary.cmake
index 33490a0..311a0db 100644
--- CMake/fl_summary.cmake
+++ 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 CMakeLists.txt CMakeLists.txt
index 5041d16..be0ede6 100644
--- CMakeLists.txt
+++ 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)
[ Direct Link to Message ] | |
|
| |