From 0e4f9ab12b86c40f84fb00d60d545710e7d6d2b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hegyi=20L=C3=A1szl=C3=B3?= <helaslo@helaslo.net>
Date: Mon, 20 Oct 2025 22:04:12 +0200
Subject: [PATCH] Add forced-version string override for releases and packaging

---
 scopehal/CMakeLists.txt | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/scopehal/CMakeLists.txt b/scopehal/CMakeLists.txt
index cab9c298..4a4b452d 100644
--- a/scopehal/CMakeLists.txt
+++ b/scopehal/CMakeLists.txt
@@ -30,12 +30,16 @@ get_target_property(Vulkan_INCLUDE_DIR Vulkan::Headers INTERFACE_INCLUDE_DIRECTO
 
 
 #Set up versioning (with a dummy string for now if Git isn't present)
-if(Git_FOUND)
-	execute_process(
-		COMMAND ${GIT_EXECUTABLE} describe --always --tags
-		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-		OUTPUT_VARIABLE SCOPEHAL_VERSION
-		OUTPUT_STRIP_TRAILING_WHITESPACE)
+if (Git_FOUND OR SCOPEHAL_PACKAGE_VERSION)
+    if(NOT SCOPEHAL_PACKAGE_VERSION)
+        execute_process(
+                    COMMAND ${GIT_EXECUTABLE} describe --always --tags
+                    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                    OUTPUT_VARIABLE SCOPEHAL_VERSION
+                    OUTPUT_STRIP_TRAILING_WHITESPACE)
+    else ()
+        set(SCOPEHAL_VERSION "${SCOPEHAL_PACKAGE_VERSION}")
+    endif ()
 else()
 	set(SCOPEHAL_VERSION "unknown")
 endif()