From e2cbd9e89fc3a73e25b7abd4f59d3a1eccaca035 Mon Sep 17 00:00:00 2001 From: Geoff McLane Date: Thu, 29 Jan 2015 18:25:57 +0100 Subject: [PATCH] Move version out to a version.txt file --- CMakeLists.txt | 22 ++++++++++++++-------- version.txt | 1 + 2 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 version.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 99f54c7..bb2e0e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,11 +3,17 @@ cmake_minimum_required (VERSION 2.8) project (tidy5) -# ### NOTE: *** Adjust when required *** -set( TIDY_MAJOR_VERSION 4 ) -set( TIDY_MINOR_VERSION 9 ) -set( TIDY_MICRO_VERSION 1 ) # adjust this for each change -set( LIBTIDY_VERSION "${TIDY_MAJOR_VERSION}.${TIDY_MINOR_VERSION}.${TIDY_MICRO_VERSION}" ) +# ### NOTE: *** Adjust version.txt when required *** +# read 'version' file into a variable (stripping any newlines or spaces) +file(READ version.txt versionFile) +if (NOT versionFile) + message(FATAL_ERROR "Unable to determine libtidy version. version.txt file is missing.") +endif() +string(STRIP "${versionFile}" LIBTIDY_VERSION) +string(REPLACE "." ";" VERSION_LIST ${LIBTIDY_VERSION}) +list(GET VERSION_LIST 0 TIDY_MAJOR_VERSION) +list(GET VERSION_LIST 1 TIDY_MINOR_VERSION) +list(GET VERSION_LIST 2 TIDY_POINT_VERSION) # establish version date set( tidy_YEAR 2015 ) @@ -67,13 +73,13 @@ add_definitions ( -DSUPPORT_UTF16_ENCODINGS=1 ) add_definitions ( -DSUPPORT_ASIAN_ENCODINGS=1 ) add_definitions ( -DSUPPORT_ACCESSIBILITY_CHECKS=1 ) add_definitions ( -DRELEASE_DATE="${tidy_YEAR}/${tidy_MONTH}/${tidy_DAY}" ) -add_definitions ( -DLIBTIDY_VERSION="${TIDY_MAJOR_VERSION}.${TIDY_MINOR_VERSION}.${TIDY_MICRO_VERSION}" ) +add_definitions ( -DLIBTIDY_VERSION="${LIBTIDY_VERSION}" ) if(BUILD_SHARED_LIB) set(LIB_TYPE SHARED) - message("*** Building DLL library ${LIB_TYPE}") + message("*** Building DLL library ${LIB_TYPE}, version ${LIBTIDY_VERSION}") else(BUILD_SHARED_LIB) - message("*** Building static library ${LIB_TYPE}") + message("*** Building static library ${LIB_TYPE}, version ${LIBTIDY_VERSION}") endif(BUILD_SHARED_LIB) include_directories ( "${PROJECT_SOURCE_DIR}/include" "${PROJECT_SOURCE_DIR}/src" ) diff --git a/version.txt b/version.txt new file mode 100644 index 0000000..dad10c7 --- /dev/null +++ b/version.txt @@ -0,0 +1 @@ +4.9.2