From 851e1e893921e6c3e6171e51c38aff722137fa4a Mon Sep 17 00:00:00 2001
From: Michael Fabian 'Xaymar' Dirks <info@xaymar.com>
Date: Sun, 31 Jan 2021 17:21:52 +0100
Subject: [PATCH] cmake: Add proper version override support

---
 CMakeLists.txt | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a9f6e9..71cce43 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,6 +89,8 @@ if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/.git")
 			set(VERSION_PATCH "${CMAKE_MATCH_1}")
 			if(CMAKE_MATCH_2)
 				set(VERSION_SUFFIX "${CMAKE_MATCH_2}")
+			else()
+				set(VERSION_SUFFIX "")
 			endif()
 		else()
 			message(WARNING "${LOGPREFIX} Failed to detect version, using default instead.")
@@ -97,17 +99,35 @@ if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/.git")
 endif()
 
 # Allow manual overrides of the detected version.
-set(${PREFIX}VERSION "" CACHE STRING "Override StreamFX version with this string. Format: /[0-9]{1,9}.[0-9]{1,9}.[0-9]{1,9}(|[a-z]{1,1}[0-9]{1,9})-[0-9]{1,9}-[0-9a-fA-F]{8,8}")
+set(${PREFIX}VERSION "" CACHE STRING "Override StreamFX version with this string. Format: Major.Minor.Patch[Suffix][-Tweak[-Commit8c]]")
 if(${PREFIX}VERSION)
 	string(REPLACE "-" "." T_VERSION "${${PREFIX}VERSION}")
-	string(REPLACE "." ";" T_VERSION "${T_VERSION}")
+	string(REPLACE "." ";" T_VERSION "${${PREFIX}VERSION}")
 
-	# Parse Version
-	list(GET GIT_OUTPUT 0 VERSION_MAJOR)
-	list(GET GIT_OUTPUT 1 VERSION_MINOR)
-	list(GET GIT_OUTPUT 2 VERSION_PATCH)
-	list(GET GIT_OUTPUT 3 VERSION_BUILD)
-	list(GET GIT_OUTPUT 4 VERSION_COMMIT)
+	list(LENGTH T_VERSION T_VERSIONLEN)
+	list(GET T_VERSION 0 VERSION_MAJOR)
+	list(GET T_VERSION 1 VERSION_MINOR)
+	list(GET T_VERSION 2 VERSION_PATCH)
+	if (T_VERSIONLEN GREATER_EQUAL 3)
+		list(GET T_VERSION 3 VERSION_BUILD)
+	else()
+		set(VERSION_BUILD 0)
+	endif()
+	if (T_VERSIONLEN GREATER_EQUAL 4)
+		list(GET T_VERSION 4 VERSION_COMMIT)
+	else()
+#		set(VERSION_COMMIT "00000000")
+	endif()
+
+	# Patch needs additional parsing.
+	# This may be a [0-9]*[a-z]*[0-9]+ string.
+	string(REGEX MATCHALL "([0-9]+)([a-z0-9]+)" T_MATCHES "${VERSION_PATCH}")
+	set(VERSION_PATCH "${CMAKE_MATCH_1}")
+	if(CMAKE_MATCH_2)
+		set(VERSION_SUFFIX "${CMAKE_MATCH_2}")
+	else()
+		set(VERSION_SUFFIX "")
+	endif()
 endif()
 
 # Generate Version String