From 5438954d8c6213f1b0cc9d23b70ffaae388e1d60 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sat, 18 Dec 2021 22:42:30 +0100 Subject: Generate FL/fl_config.h rather than FL/abi-version.h ... as discussed in fltk.coredev in thread "RFC: introduce public config header ", see: https://groups.google.com/g/fltkcoredev/c/xLCs1AIXMVo/m/MHZpQggzAQAJ - Rename abi-version.h to fl_config.h, rename input files, update dependencies, .gitignore, CMake, configure and Makefiles. - Include Cairo options in FL/fl_config.h - Rename FLTK_USE_CAIRO to FLTK_HAVE_CAIROEXT for consistency. - Include in config.h and wherever necessary, fix include order (move FL/Fl.H to the top) and more. - Move USE_X11 to fl_config.h and rename to FLTK_USE_X11 - Do not include in Cairo demo program which is no longer required in Cairo programs since FLTK 1.4.0 --- CMake/fl_create_example.cmake | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'CMake/fl_create_example.cmake') diff --git a/CMake/fl_create_example.cmake b/CMake/fl_create_example.cmake index 66c8efc58..c2db54e30 100644 --- a/CMake/fl_create_example.cmake +++ b/CMake/fl_create_example.cmake @@ -116,6 +116,11 @@ macro (CREATE_EXAMPLE NAME SOURCES LIBRARIES) set_target_properties (${TARGET_NAME} PROPERTIES OUTPUT_NAME ${NAME}) target_link_libraries (${TARGET_NAME} ${LIBRARIES}) + # we must link all programs with fltk_cairo if option CAIROEXT is enabled + if (FLTK_HAVE_CAIROEXT) + target_link_libraries (${TARGET_NAME} fltk_cairo cairo) + endif () + if (FLTK_HAVE_CAIRO) fl_target_link_directories (${TARGET_NAME} PRIVATE "${PKG_CAIRO_LIBRARY_DIRS}") endif () -- cgit v1.2.3