From 6cb97e220835e456747c175682a189cc70740577 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Tue, 30 Aug 2022 23:05:17 +0200 Subject: [PATCH] CMake: show extra toolkit options in summary Just like configure does. --- build/cmake/init.cmake | 8 ++++++-- build/cmake/main.cmake | 7 ++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake index 510c7f8847..0a894335f2 100644 --- a/build/cmake/init.cmake +++ b/build/cmake/init.cmake @@ -520,8 +520,11 @@ if(wxUSE_GUI) if(NOT LIBNOTIFY_FOUND) message(WARNING "Libnotify not found, it won't be used for notifications") wx_option_force_value(wxUSE_LIBNOTIFY OFF) - elseif(NOT LIBNOTIFY_VERSION VERSION_LESS 0.7) - set(wxUSE_LIBNOTIFY_0_7 ON) + else() + if(NOT LIBNOTIFY_VERSION VERSION_LESS 0.7) + set(wxUSE_LIBNOTIFY_0_7 ON) + endif() + list(APPEND wxTOOLKIT_EXTRA "libnotify") endif() else() set(wxUSE_LIBNOTIFY OFF) @@ -566,6 +569,7 @@ if(wxUSE_GUI) if(GNOMEVFS2_FOUND) list(APPEND wxTOOLKIT_INCLUDE_DIRS ${GNOMEVFS2_INCLUDE_DIRS}) list(APPEND wxTOOLKIT_LIBRARIES ${GNOMEVFS2_LIBRARIES}) + list(APPEND wxTOOLKIT_EXTRA "gnomevfs") else() message(STATUS "libgnomevfs not found, library won't be used to associate MIME type") wx_option_force_value(wxUSE_LIBGNOMEVFS OFF) diff --git a/build/cmake/main.cmake b/build/cmake/main.cmake index c0babe9d86..a87aeeeab1 100644 --- a/build/cmake/main.cmake +++ b/build/cmake/main.cmake @@ -77,9 +77,14 @@ endif() # Print configuration summary wx_print_thirdparty_library_summary() +if(wxTOOLKIT_EXTRA) + string(REPLACE ";" ", " wxTOOLKIT_DESC "${wxTOOLKIT_EXTRA}") + set(wxTOOLKIT_DESC "with support for: ${wxTOOLKIT_DESC}") +endif() + message(STATUS "Configured wxWidgets ${wxVERSION} for ${CMAKE_SYSTEM} Min OS Version required at runtime: ${wxREQUIRED_OS_DESC} - Which GUI toolkit should wxWidgets use? ${wxBUILD_TOOLKIT} ${wxTOOLKIT_VERSION} + Which GUI toolkit should wxWidgets use? ${wxBUILD_TOOLKIT} ${wxTOOLKIT_VERSION} ${wxTOOLKIT_DESC} Should wxWidgets be compiled into single library? ${wxBUILD_MONOLITHIC} Should wxWidgets be linked as a shared library? ${wxBUILD_SHARED} Should wxWidgets support Unicode? ${wxUSE_UNICODE}