From 3c7bb5bfa34cece06c7a65657b04fa46cdcb4f95 Mon Sep 17 00:00:00 2001 From: bergmann Date: Fri, 2 Aug 2019 12:04:45 +0200 Subject: [PATCH] * Fixd bug: Reading git tags will fail if the tag is on the current commit --- git_helper.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/git_helper.cmake b/git_helper.cmake index ea9bc79..e55696e 100644 --- a/git_helper.cmake +++ b/git_helper.cmake @@ -47,11 +47,15 @@ Function ( GitGetVersion GIT_ROOT OUT_MAJOR OUT_MINOR OUT_PATCH OUT_BUILD OUT_HA String ( REGEX REPLACE "^v" "" TAG "${TAG}" ) String ( REPLACE "-" ";" SPLIT "${TAG}" ) List ( LENGTH SPLIT COUNT ) - If ( ${COUNT} LESS 2 ) + If ( ${COUNT} LESS 1 ) Message ( FATAL_ERROR "Unable to split git tag into it's sub components: ${TAG}!" ) EndIf ( ) List ( GET SPLIT 0 VERSION ) - List ( GET SPLIT 1 BEHIND ) + If ( ${COUNT} GREATER 1 ) + List ( GET SPLIT 1 BEHIND ) + Else ( ) + Set ( BEHIND 0 ) + EndIf ( ) # Split the version String ( STRIP "${VERSION}" SPLIT )