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 /configure.ac | |
| 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 'configure.ac')
| -rw-r--r-- | configure.ac | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 921b17814..692c3d706 100644 --- a/configure.ac +++ b/configure.ac @@ -56,19 +56,20 @@ case $host_os in esac dnl FLTK library versions... -FL_MAJOR_VERSION=1 -FL_MINOR_VERSION=4 -FL_PATCH_VERSION=0 -FL_DSO_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION} -FL_ABI_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.0 -FL_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.${FL_PATCH_VERSION} - -AC_SUBST(FL_MAJOR_VERSION) -AC_SUBST(FL_MINOR_VERSION) -AC_SUBST(FL_PATCH_VERSION) +FLTK_VERSION_MAJOR=1 +FLTK_VERSION_MINOR=4 +FLTK_VERSION_PATCH=0 +FLTK_VERSION=${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}.${FLTK_VERSION_PATCH} + +FL_DSO_VERSION=${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR} +FL_ABI_VERSION=${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}.0 + +AC_SUBST(FLTK_VERSION_MAJOR) +AC_SUBST(FLTK_VERSION_MINOR) +AC_SUBST(FLTK_VERSION_PATCH) +AC_SUBST(FLTK_VERSION) AC_SUBST(FL_DSO_VERSION) AC_SUBST(FL_ABI_VERSION) -AC_SUBST(FL_VERSION) AC_SUBST(ARCHFLAGS) AC_SUBST(OPTIM) |