From 5175192755e57d1d7016253d48f34f9d0c2c0832 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Thu, 9 Mar 2023 13:21:49 +0200 Subject: CMake: build shared libs with OPTION_CAIROEXT (issue #250) - remove separate libfltk_cairo to avoid cyclic dependencies, but - keep a dummy libfltk_cairo in 1.4.0 for backwards compatibility - move cairo/Fl_Cairo.cxx to src/Fl_Cairo.cxx - add preliminary Cairo support for Visual Studio (MSVC) Static linking is not affected by this change, but users building with hand-made Makefiles will have to remove libfltk_cairo starting with FLTK 1.4.0. The dummy library can be linked for backwards compatibility but it will be removed later (in 1.4.x or 1.5.0). The shared FLTK library libfltk.{so|dylib|dll|..} depends on libcairo if and only if FLTK is built with one of the Cairo options. This has always been the case for OPTION_CAIROEXT but is now also true if only OPTION_CAIRO is selected, i.e. FLTK programs linked with a Cairo enabled shared FLTK library will also be linked with libcairo. The same is true for configure options --enable-cairo and --enable-cairoext, respectively. Preliminary Cairo support for MSVC now detects a Cairo installation using the CMake variable FLTK_CAIRO_DIR which must be set by the user. Note that this feature is temporary and may be changed in the future for a better and more comfortable version. --- documentation/Doxyfile.in | 1 - 1 file changed, 1 deletion(-) (limited to 'documentation') diff --git a/documentation/Doxyfile.in b/documentation/Doxyfile.in index 181de6494..6f3975464 100644 --- a/documentation/Doxyfile.in +++ b/documentation/Doxyfile.in @@ -570,7 +570,6 @@ INPUT += @CMAKE_CURRENT_SOURCE_DIR@/src/advanced.dox INPUT += @CMAKE_CURRENT_SOURCE_DIR@/src/unicode.dox INPUT += @FLTK_SOURCE_DIR@/FL INPUT += @FLTK_SOURCE_DIR@/src -INPUT += @FLTK_SOURCE_DIR@/cairo INPUT += @CMAKE_CURRENT_SOURCE_DIR@/src/enumerations.dox INPUT += @CMAKE_CURRENT_SOURCE_DIR@/src/glut.dox INPUT += @CMAKE_CURRENT_SOURCE_DIR@/src/forms.dox -- cgit v1.2.3