From 9adb18115634bf35868de920a0d0be2009beb86a Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sun, 12 Jul 2015 19:23:55 +0000 Subject: Make FL_ABI_VERSION configurable (STR #3161). This commit adds the configure option --with-abiversion and the CMake option OPTION_ABI_VERSION. Both options can be set e.g. to 10304 to build with FL_ABI_VERSION = 10304 (FLTK 1.3.4). For IDE builds there are new files ide//FL/abi-version.h that can be edited to change the ABI version before the FLTK lib is built. Note that this file MUST be copied to the include/FL directory if the IDE-built library is to be installed. The default is FL_ABI_VERSION = FL_MAJOR*10000 + FL_MINOR*100 + 0, i.e. 10300 for all FLTK 1.3.x versions to keep binary compatibility (ABI). Todo: more tests and more documentation. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10786 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CMake/install.cmake | 4 ++++ CMake/options.cmake | 7 +++++++ 2 files changed, 11 insertions(+) (limited to 'CMake') diff --git a/CMake/install.cmake b/CMake/install.cmake index 755489b02..e97d02890 100644 --- a/CMake/install.cmake +++ b/CMake/install.cmake @@ -36,6 +36,10 @@ install(DIRECTORY ${FLTK_SOURCE_DIR}/FL PATTERN ".svn" EXCLUDE ) +install(DIRECTORY ${FLTK_BINARY_DIR}/FL + DESTINATION ${FLTK_INCLUDEDIR} USE_SOURCE_PERMISSIONS +) + if(OPTION_CREATE_LINKS) install(SCRIPT ${FLTK_BINARY_DIR}/install-symlinks.cmake) endif(OPTION_CREATE_LINKS) diff --git a/CMake/options.cmake b/CMake/options.cmake index 1444ae154..1c721d131 100644 --- a/CMake/options.cmake +++ b/CMake/options.cmake @@ -33,6 +33,13 @@ set(OPTION_ARCHFLAGS "" ) add_definitions(${OPTION_ARCHFLAGS}) +####################################################################### +set(OPTION_ABI_VERSION "" + CACHE STRING + "FLTK ABI Version (FL_ABI_VERSION - define as 10x0y for 1.x.y)" + ) +set(FL_ABI_VERSION ${OPTION_ABI_VERSION}) + ####################################################################### ####################################################################### if(UNIX) -- cgit v1.2.3