From 6586774cb4ade30b6f5c5ba90a107c4d8fb402e3 Mon Sep 17 00:00:00 2001 From: Aki Date: Sat, 11 Mar 2023 19:14:41 +0100 Subject: Renamed cmake version variable to VERSION --- cmake/modules/generate_version_file.cmake | 6 +++--- kurator/src/version.cpp.conf | 2 +- version.txt.conf | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/modules/generate_version_file.cmake b/cmake/modules/generate_version_file.cmake index bbe34c6..cdbce42 100644 --- a/cmake/modules/generate_version_file.cmake +++ b/cmake/modules/generate_version_file.cmake @@ -10,11 +10,11 @@ execute_process( OUTPUT_STRIP_TRAILING_WHITESPACE ) if(NOT PARSE_RESULT) - set(HASH "${PARSE_OUTPUT}") + set(VERSION "${PARSE_OUTPUT}") if(NOT ${STATUS_OUTPUT}) - set(HASH "${HASH}*") + set(VERSION "${VERSION}*") endif() else() - set(HASH "NOTFOUND") + set(VERSION "NOTFOUND") endif() configure_file("${TEMPLATE}" "${OUTPUT}" @ONLY) diff --git a/kurator/src/version.cpp.conf b/kurator/src/version.cpp.conf index a389f23..0eb619a 100644 --- a/kurator/src/version.cpp.conf +++ b/kurator/src/version.cpp.conf @@ -2,7 +2,7 @@ namespace kurator { -const char* VERSION {"@HASH@"}; +const char* VERSION {"@VERSION@"}; } // namespace kurator diff --git a/version.txt.conf b/version.txt.conf index cc0fa45..d78bda9 100644 --- a/version.txt.conf +++ b/version.txt.conf @@ -1 +1 @@ -@HASH@ +@VERSION@ -- cgit v1.1