Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FormerLurker/ArcWelderLib.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'GcodeProcessorLib/CMakeLists.txt')
-rw-r--r--GcodeProcessorLib/CMakeLists.txt10
1 files changed, 9 insertions, 1 deletions
diff --git a/GcodeProcessorLib/CMakeLists.txt b/GcodeProcessorLib/CMakeLists.txt
index 21fe511..52d1d3a 100644
--- a/GcodeProcessorLib/CMakeLists.txt
+++ b/GcodeProcessorLib/CMakeLists.txt
@@ -20,9 +20,17 @@ execute_process(
OUTPUT_STRIP_TRAILING_WHITESPACE
)
+# get the tag for the current branch
+execute_process(
+ COMMAND git describe --abbrev=0
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+ OUTPUT_VARIABLE GIT_TAG
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
# get the most recent tagged version
execute_process(
- COMMAND git describe --tags
+ COMMAND git describe
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE GIT_TAGGED_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE