From 877d196ef5c28321d94c9dfd978b7cae35672533 Mon Sep 17 00:00:00 2001 From: glx Date: Fri, 5 Jun 2020 21:43:22 +0200 Subject: Fix: Incorrect REV_YEAR, and parsing of .ottdrev --- cmake/scripts/FindVersion.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cmake/scripts/FindVersion.cmake') diff --git a/cmake/scripts/FindVersion.cmake b/cmake/scripts/FindVersion.cmake index 00afa15ca..d48664fc8 100644 --- a/cmake/scripts/FindVersion.cmake +++ b/cmake/scripts/FindVersion.cmake @@ -49,7 +49,7 @@ if (GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git") ) string(REGEX REPLACE "([0-9]+)-([0-9]+)-([0-9]+).*" "\\1\\2\\3" COMMITDATE "${COMMITDATE}") set(REV_ISODATE "${COMMITDATE}") - string(SUBSTRING REV_ISODATE 1 4 REV_YEAR) + string(SUBSTRING "${REV_ISODATE}" 0 4 REV_YEAR) # Get the branch execute_process(COMMAND ${GIT_EXECUTABLE} symbolic-ref -q HEAD @@ -98,6 +98,7 @@ if (GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git") set(ENV{LC_ALL} "${SAVED_LC_ALL}") elseif (EXISTS "${CMAKE_SOURCE_DIR}/.ottdrev") file(READ "${CMAKE_SOURCE_DIR}/.ottdrev" OTTDREV) + string(REPLACE "\n" "" OTTDREV "${OTTDREV}") string(REPLACE "\t" ";" OTTDREV "${OTTDREV}") list(GET OTTDREV 0 REV_VERSION) list(GET OTTDREV 1 REV_ISODATE) -- cgit v1.2.3-70-g09d2