From a185956ed34b1ac91b18917a65f925406d574b6f Mon Sep 17 00:00:00 2001
From: VintagePC <53943260+vintagepc@users.noreply.github.com>
Date: Mon, 11 Sep 2023 18:51:07 -0400
Subject: [PATCH] fix commit number handling

---
 cmake/GetGitRevisionDescription.cmake | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/cmake/GetGitRevisionDescription.cmake b/cmake/GetGitRevisionDescription.cmake
index 29fa5c4134..c9e8611081 100644
--- a/cmake/GetGitRevisionDescription.cmake
+++ b/cmake/GetGitRevisionDescription.cmake
@@ -231,7 +231,7 @@ function(git_describe_working_tree _var)
     endif()
     git_head_commit_number(COMMIT_COUNT) #Bake the commit count into the full DSC
     execute_process(
-        COMMAND "${GIT_EXECUTABLE}" describe --abbrev=0 --dirty=-${COMMIT_COUNT}-D --broken=-B ${ARGN}
+        COMMAND "${GIT_EXECUTABLE}" describe --abbrev=0 --dirty=-D --broken=-B ${ARGN}
         WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
         RESULT_VARIABLE res
         OUTPUT_VARIABLE out
@@ -239,7 +239,11 @@ function(git_describe_working_tree _var)
     if(NOT res EQUAL 0)
         set(out "${out}-${res}-NOTFOUND")
     endif()
-
+    if( "${out}" MATCHES "-D\$")
+        STRING(REPLACE "-D" "-${COMMIT_COUNT}-D" out "${out}")
+    else()
+        set(out "${out}-${COMMIT_COUNT}")
+    endif()
     set(${_var}
         "${out}"
         PARENT_SCOPE)