From dbc451190a96f224c3fb8b5d14da5475ddc8dd66 Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Wed, 8 Oct 2025 13:35:32 +0100
Subject: [PATCH] Don't append the git revision if tagged to match the current
 version

---
 CMakeLists.txt | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ff995cd..5c7336b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,14 +51,23 @@ if(NOT PRODUCT_VERSION)
 
     if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
         execute_process(
-            COMMAND git show -s --pretty=format:%h
+            COMMAND git describe --tags --exact-match
             WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-            OUTPUT_VARIABLE GIT_REV
+            OUTPUT_VARIABLE GIT_TAG
             OUTPUT_STRIP_TRAILING_WHITESPACE
             ERROR_QUIET)
 
-        if(GIT_REV)
-            set(PRODUCT_VERSION "${PRODUCT_VERSION}_g${GIT_REV}")
+        if(NOT GIT_TAG STREQUAL "${PRODUCT_VERSION}")
+            execute_process(
+                COMMAND git show -s --pretty=format:%h
+                WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+                OUTPUT_VARIABLE GIT_REV
+                OUTPUT_STRIP_TRAILING_WHITESPACE
+                ERROR_QUIET)
+
+            if(GIT_REV)
+                set(PRODUCT_VERSION "${PRODUCT_VERSION}_g${GIT_REV}")
+            endif()
         endif()
     endif()
 endif()