From fd5cd809356dc73d2ede5bb2f0db25098771cb8e Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Wed, 7 Feb 2024 18:30:11 +0100 Subject: Introduce "Modern CMake" in FLTK This is a big commit and there are too many changes to list them all. The main changes are: - rename all CMake build options to 'FLTK_*' - export library targets with namespace (prefix) 'fltk::' - standardize shared library target names with suffix '-shared' - set public build properties on libraries for consumers - document library names and aliases in README.CMake.txt - document changes in "Migrating Code from FLTK 1.3 to 1.4" - partial backwards compatibility for old user projects Included but not directly related changes: - fix Windows (Visual Studio) DLL build - add CMake function fl_debug_target() to show target properties - don't build test programs if FLTK is a subproject - internal: reformat CMake code: remove space before '(' Thanks to Matthias and Manolo for their help, testing, and feeback. --- test/cairo_test.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/cairo_test.cxx') diff --git a/test/cairo_test.cxx b/test/cairo_test.cxx index ae3d9d736..545e636a2 100644 --- a/test/cairo_test.cxx +++ b/test/cairo_test.cxx @@ -27,7 +27,7 @@ #define DEF_WIDTH 0.03 // This demo program can be used in 3 modes. All 3 modes require configure -// option --enable-cairo or CMake OPTION_CAIRO. +// option --enable-cairo or CMake FLTK_OPTION_CAIRO_WINDOW. // // 1) using class Fl_Cairo_Window useful when all the content of a window // is drawn with Cairo. @@ -39,7 +39,7 @@ // or // 3) showing how to use "cairo extended use". // This is achieved when FLTK was built with one more option -// (configure --enable-cairoext or CMake OPTION_CAIROEXT) +// (configure --enable-cairoext or CMake FLTK_OPTION_CAIRO_EXT) // which defines the preprocessor variable FLTK_HAVE_CAIROEXT. // If Fl::cairo_autolink_context(true); is called at the beginning // of main(), any overridden draw() function gets access to an adequate @@ -212,7 +212,7 @@ int main(int argc, char **argv) { fl_message_title("This program needs a Cairo enabled FLTK library"); fl_message( "Please configure FLTK with Cairo enabled (--enable-cairo or --enable-cairoext)\n" - "or one of the CMake options OPTION_CAIRO or OPTION_CAIROEXT, respectively."); + "or one of the CMake options FLTK_OPTION_CAIRO_WINDOW or FLTK_OPTION_CAIRO_EXT, respectively."); return 0; } #endif // (FLTK_HAVE_CAIRO) -- cgit v1.2.3