diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2020-06-13 15:19:27 +0200 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2020-07-15 00:34:53 +0200 |
| commit | 720b84ef9d086245f5119d143202a2661a78ca53 (patch) | |
| tree | 26bcd11ffa797c3c01917507e9204fbc9f9b45aa /makeinclude.in | |
| parent | 54425030774eb04b29c749ffa85d224c8bbfcc34 (diff) | |
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
Diffstat (limited to 'makeinclude.in')
| -rw-r--r-- | makeinclude.in | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/makeinclude.in b/makeinclude.in index 7980ac06b..e00baa8ea 100644 --- a/makeinclude.in +++ b/makeinclude.in @@ -16,13 +16,9 @@ # FLTK version numbers -FL_MAJOR_VERSION = @FL_MAJOR_VERSION@ -FL_MINOR_VERSION = @FL_MINOR_VERSION@ -FL_PATCH_VERSION = @FL_PATCH_VERSION@ - +FL_VERSION = @FLTK_VERSION@ FL_DSO_VERSION = @FL_DSO_VERSION@ FL_ABI_VERSION = @FL_ABI_VERSION@ -FL_VERSION = @FL_VERSION@ # FLTK configuration options: BUILD = { WIN | OSX | X11 | XFT } |