[actions][cmake] Add --tags option to git describe

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ff6224f..b592402 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,7 +37,7 @@ jobs:
           fetch-depth: 0
 
       - name: Run "git describe"
-        run: echo "TIM41_DESCRIBE=$(git describe --first-parent)" >> $GITHUB_ENV
+        run: echo "TIM41_DESCRIBE=$(git describe --first-parent --tags)" >> $GITHUB_ENV
         shell: bash
         working-directory: timidity41
 

diff --git a/WriteVersion.cmake b/WriteVersion.cmake
index 3d0b0ed..9601358 100644 (file)
--- a/WriteVersion.cmake
+++ b/WriteVersion.cmake
@@ -1,6 +1,6 @@
 
 execute_process(
-    COMMAND "${GIT_EXECUTABLE}" describe --first-parent
+    COMMAND "${GIT_EXECUTABLE}" describe --first-parent --tags
     OUTPUT_VARIABLE gitDescribeResult
     OUTPUT_STRIP_TRAILING_WHITESPACE
 )