From ad49746fd149b560407623fd876329f41f473530 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Sun, 26 Oct 2014 21:18:37 +0100 Subject: [PATCH] Write tomahawk version to cache --- CMakeLists.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 05e787102..0943886a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,27 +92,29 @@ ENDIF() # generate version string # base string used in release and unstable builds -SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION_MAJOR}.${TOMAHAWK_VERSION_MINOR}.${TOMAHAWK_VERSION_PATCH} ) -SET( TOMAHAWK_VERSION_SHORT "${TOMAHAWK_VERSION}" ) +SET( TOMAHAWK_VERSION_TMP "${TOMAHAWK_VERSION_MAJOR}.${TOMAHAWK_VERSION_MINOR}.${TOMAHAWK_VERSION_PATCH}") +SET( TOMAHAWK_VERSION_SHORT "${TOMAHAWK_VERSION_TMP}" ) IF( TOMAHAWK_VERSION_RC ) - SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}rc${TOMAHAWK_VERSION_RC} ) + SET( TOMAHAWK_VERSION "${TOMAHAWK_VERSION_TMP}rc${TOMAHAWK_VERSION_RC}" CACHE STRING "Tomahawk Version") ENDIF() - # additional info for non-release builds IF( NOT BUILD_RELEASE AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git/" ) INCLUDE( CMakeDateStamp ) SET( TOMAHAWK_VERSION_DATE "${CMAKE_DATESTAMP_YEAR}${CMAKE_DATESTAMP_MONTH}${CMAKE_DATESTAMP_DAY}" ) IF( TOMAHAWK_VERSION_DATE GREATER 0 ) - SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}.${TOMAHAWK_VERSION_DATE} ) + SET( TOMAHAWK_VERSION_TMP ${TOMAHAWK_VERSION}.${TOMAHAWK_VERSION_DATE} ) ENDIF() INCLUDE( CMakeVersionSource ) IF( CMAKE_VERSION_SOURCE ) - SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}-${CMAKE_VERSION_SOURCE} ) + SET( TOMAHAWK_VERSION_TMP ${TOMAHAWK_VERSION_TMP}-${CMAKE_VERSION_SOURCE} ) ENDIF() ENDIF() +# write Tomahawk version to cache +SET(TOMAHAWK_VERSION "${TOMAHAWK_VERSION_TMP}" CACHE STRING "Tomahawk Version") + # set paths SET( THIRDPARTY_DIR "${CMAKE_SOURCE_DIR}/thirdparty" )