diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2021-12-18 22:42:30 +0100 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2021-12-18 22:44:08 +0100 |
| commit | 5438954d8c6213f1b0cc9d23b70ffaae388e1d60 (patch) | |
| tree | 101eeda4bf98583d566eeb4b0870d2bde95dea69 /CMake/options.cmake | |
| parent | 797616841caaf3322c79c15b1d9c74d03b54ea12 (diff) | |
Generate FL/fl_config.h rather than FL/abi-version.h
... as discussed in fltk.coredev in thread "RFC: introduce public
config header <FL/fl_config.h>", 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 <FL/fl_config.h> 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 <config.h> in Cairo demo program which is no
longer required in Cairo programs since FLTK 1.4.0
Diffstat (limited to 'CMake/options.cmake')
| -rw-r--r-- | CMake/options.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CMake/options.cmake b/CMake/options.cmake index cad4b86e2..f1e347fbc 100644 --- a/CMake/options.cmake +++ b/CMake/options.cmake @@ -76,7 +76,7 @@ set (PATH_TO_XLIBS) if ((NOT APPLE OR OPTION_APPLE_X11) AND NOT WIN32) include (FindX11) if (X11_FOUND) - set (USE_X11 1) + set (FLTK_USE_X11 1) list (APPEND FLTK_LDLIBS -lX11) if (X11_Xext_FOUND) list (APPEND FLTK_LDLIBS -lXext) @@ -164,7 +164,7 @@ option (OPTION_CAIROEXT ) set (FLTK_HAVE_CAIRO 0) -set (FLTK_USE_CAIRO 0) +set (FLTK_HAVE_CAIROEXT 0) if (OPTION_CAIRO OR OPTION_CAIROEXT) pkg_search_module (PKG_CAIRO cairo) @@ -174,7 +174,7 @@ if (OPTION_CAIRO OR OPTION_CAIROEXT) if (PKG_CAIRO_FOUND) set (FLTK_HAVE_CAIRO 1) if (OPTION_CAIROEXT) - set (FLTK_USE_CAIRO 1) + set (FLTK_HAVE_CAIROEXT 1) endif (OPTION_CAIROEXT) add_subdirectory (cairo) |