From babf17cf6fc9ae96b80928f134603ac067a70ba7 Mon Sep 17 00:00:00 2001 From: Christian Zimmermann Date: Thu, 31 Aug 2023 12:50:29 +0200 Subject: [PATCH] try to fix CMakeLists.txt --- CMakeLists.txt | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9648052..2de298f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,15 +5,19 @@ 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-list -n 1 ${GIT_TAG}" OUTPUT_VARIABLE GIT_TAG_HASH OUTPUT_STRIP_TRAILING_WHITESPACE) -message(STATUS "${GIT_TAG}") message(STATUS "${GIT_HASH}") -message(STATUS "${GIT_TAG_HASH}") -string(SUBSTRING "${GIT_TAG}" 1 -1 VERSION) -if(NOT ("${GIT_HASH}" EQUAL "${GIT_TAG_HASH}")) - string(SUBSTRING ${GIT_HASH} 0 7 GIT_HASH_SHORT) - set(VERSION "${VERSION}-${GIT_HASH_SHORT}") +if("${GIT_TAG}" EQUAL "") + set(VERSION "v0.0.0-test") +else() + message(STATUS "${GIT_TAG}") + message(STATUS "${GIT_TAG_HASH}") + string(SUBSTRING "${GIT_TAG}" 1 -1 VERSION) + if(NOT ("${GIT_HASH}" EQUAL "${GIT_TAG_HASH}")) + string(SUBSTRING ${GIT_HASH} 0 7 GIT_HASH_SHORT) + set(VERSION "${VERSION}-${GIT_HASH_SHORT}") + endif() endif() - + if(CMAKE_COMPILER_IS_GNUCXX) if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 7.0) message(FATAL_ERROR "require gcc version >= 7.0")