Merge branch 'dev' of git.f3l.de:chizeta/cnorxz into dev

This commit is contained in:
Christian Zimmermann 2023-02-26 20:15:14 +01:00
commit 82fab9f7dc

View file

@ -4,9 +4,9 @@ project(cnorxz)
execute_process(COMMAND bash "-c" "git rev-parse HEAD" OUTPUT_VARIABLE GIT_HASH OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND bash "-c" "git tag -l --sort=refname v* | tail -n1" OUTPUT_VARIABLE GIT_TAG OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND bash "-c" "git rev-parse ${GIT_TAG}" OUTPUT_VARIABLE GIT_TAG_HASH OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND bash "-c" "git rev-list -n 1 ${GIT_TAG}" OUTPUT_VARIABLE GIT_TAG_HASH OUTPUT_STRIP_TRAILING_WHITESPACE)
string(SUBSTRING ${GIT_TAG} 1 -1 VERSION)
if(NOT ${GIT_HASH} EQUAL ${GIT_TAG_HASH})
if(NOT (${GIT_HASH} EQUAL ${GIT_TAG_HASH}))
string(SUBSTRING ${GIT_HASH} 0 7 GIT_HASH_SHORT)
set(VERSION "${VERSION}-${GIT_HASH_SHORT}")
endif()