From 1209e9dcd7e1e97bedc747d06ba4eea837562158 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sun, 22 Oct 2023 19:30:37 +0200 Subject: Make Fl_String and Fl_Int_Vector private (#789) - add CMake option 'OPTION_USE_STD' - add configure option '--enable-use_std' - move FL/Fl_String.H to src/Fl_String.H - move FL/Fl_Int_Vector.H to src/Fl_Int_Vector.H - remove Fl_String from demo program examples/callbacks.cxx - remove Fl_Int_Vector from public header FL/Fl_Table.H - some methods of Fl_Table are no longer inline - add CMake option OPTION_USE_STD to allow std::string in some selected functions and methods Experimental, may be removed before release: - use either Fl_Int_Vector or std::vector in Fl_Table depending on CMake OPTION_USE_STD or configure --enable-use_std Move all fl_filename* functions that use Fl_String to fluid Main changes in fluid: - add fluid_filename.h and .cxx - include "fluid_filename.h" rather than Update fl_input(), fl_password() and test/ask - add maxchar parameter to fl_input() and fl_password() - fl_input_str() and fl_password_str() are optional and return std::string if enabled (FLTK_USE_STD) --- CMakeLists.txt | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index ad47d4139..3c3b8c938 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -262,56 +262,62 @@ else () endif () if (FLTK_USE_BUILTIN_JPEG) - message (STATUS "Image Libraries: JPEG = Builtin") + message (STATUS "Image Libraries : JPEG = Builtin") else () - message (STATUS "Image Libraries: JPEG = System") + message (STATUS "Image Libraries : JPEG = System") endif () if (FLTK_USE_BUILTIN_PNG) - message (STATUS " PNG = Builtin") + message (STATUS " : PNG = Builtin") else () - message (STATUS " PNG = System") + message (STATUS " : PNG = System") endif () if (FLTK_USE_BUILTIN_ZLIB) - message (STATUS " ZLIB = Builtin") + message (STATUS " : ZLIB = Builtin") else () - message (STATUS " ZLIB = System") + message (STATUS " : ZLIB = System") endif () if (UNIX AND NOT (APPLE AND NOT OPTION_APPLE_X11)) if (OPTION_USE_WAYLAND) - message (STATUS "Use Wayland: Yes (when available at run-time)") + message (STATUS "Use Wayland : Yes (if available at run-time)") else () - message (STATUS "Use Wayland: No (therefore, X11 is used)") + message (STATUS "Use Wayland : No (therefore, X11 is used)") endif () if (FLTK_USE_CAIRO) - message (STATUS "All drawing uses Cairo: Yes") + message (STATUS "All drawing uses Cairo : Yes") else () - message (STATUS "All drawing uses Cairo: No") + message (STATUS "All drawing uses Cairo : No") endif () if (USE_PANGO) - message (STATUS "Use Pango: Yes") + message (STATUS "Use Pango : Yes") else (USE_PANGO) - message (STATUS "Use Pango: No") + message (STATUS "Use Pango : No") if (USE_XFT) - message (STATUS "Use Xft: Yes") + message (STATUS "Use Xft : Yes") else () - message (STATUS "Use Xft: No") + message (STATUS "Use Xft : No") endif (USE_XFT) endif (USE_PANGO) endif (UNIX AND NOT (APPLE AND NOT OPTION_APPLE_X11)) if (FLTK_HAVE_CAIROEXT) - message (STATUS "Fl_Cairo_Window support: Yes (extended)") + message (STATUS "Fl_Cairo_Window support : Yes (extended)") elseif (FLTK_HAVE_CAIRO) - message (STATUS "Fl_Cairo_Window support: Yes (standard)") + message (STATUS "Fl_Cairo_Window support : Yes (standard)") else () - message (STATUS "Fl_Cairo_Window support: No") + message (STATUS "Fl_Cairo_Window support : No") +endif () + +if (FLTK_USE_STD) + message (STATUS "Use std:: : Yes") +else () + message (STATUS "Use std:: : No") endif () message ("") -- cgit v1.2.3