From 720b84ef9d086245f5119d143202a2661a78ca53 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sat, 13 Jun 2020 15:19:27 +0200 Subject: CMake: refactor and reformat CMake files - raise minimum CMake version from 2.6.3 to 3.2.3 (Jun 01, 2015) - indent all CMake files according to the CMP (2 col.) - refactor FLTK version number definitions and usage - unify CMake and autoconf/configure variable names: - FL_VERSION -> FLTK_VERSION - FL_MAJOR_VERSION -> FLTK_VERSION_MAJOR - etc. for _MINOR_ and _PATCH_, respectively - note: this does not affect FL_VERSION etc. in source code - generate "export headers" for all libraries (experimental: OFF) - port some forgotten goodies from branch-1.3 to master - merge and improve macro 'create_example' (WIP) - remove "temporary" options and code for older CMake versions - include and use 'GenerateExportHeader' (experimental, WIP: OFF) - note: created header files are not yet used - build only *one* DLL with Visual Studio (tested, works) - similar to the bundled IDE projects in 1.3.x - add some dynamically linked test/demo programs ('*-shared') if shared libraries are built (WIP) - split 'macros.cmake': use one file per macro --- documentation/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'documentation/Makefile') diff --git a/documentation/Makefile b/documentation/Makefile index a1c370799..5e95ad5b8 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -132,7 +132,7 @@ uninstall-linux uninstall-osx: Doxyfile: Doxyfile.in echo "Generating Doxyfile ..." - sed -e's,@FL_VERSION@,$(FL_VERSION),' \ + sed -e's,@FLTK_VERSION@,$(FLTK_VERSION),' \ -e's,@GENERATE_HTML@,YES,' \ -e's,@GENERATE_LATEX@,NO,' \ -e's, @LATEX_HEADER@,,' \ @@ -142,7 +142,7 @@ Doxyfile: Doxyfile.in Doxybook: Doxyfile.in echo "Generating Doxybook ..." - sed -e's,@FL_VERSION@,$(FL_VERSION),' \ + sed -e's,@FLTK_VERSION@,$(FLTK_VERSION),' \ -e's,@GENERATE_HTML@,NO,' \ -e's,@GENERATE_LATEX@,YES,' \ -e's,@LATEX_HEADER@,src/fltk-book.tex,' \ @@ -183,6 +183,6 @@ src/fltk-book.tex: src/fltk-book.tex.in DOXY_VERSION=`$(DOXYDOC) --version`; \ YEAR=`date +%Y`; \ sed -e"s/@YEAR@/$$YEAR/g" \ - -e"s/@FL_VERSION@/$(FL_VERSION)/g" \ + -e"s/@FLTK_VERSION@/$(FLTK_VERSION)/g" \ -e"s/@DOXY_VERSION@/$$DOXY_VERSION/g" \ < $< > $@ -- cgit v1.2.3