X-Git-Url: http://git.treefish.org/~alex/cmake-modules/cmake-getgitversion.git/blobdiff_plain/2ed84c23840de23e56fd495853aa5db26708f246..01c88bbd2d56bbca1e3900daa5342f412a1d2ad7:/GetGitVersion.cmake

diff --git a/GetGitVersion.cmake b/GetGitVersion.cmake
index e673152..8f679d3 100644
--- a/GetGitVersion.cmake
+++ b/GetGitVersion.cmake
@@ -1,10 +1,10 @@
-# __________________________________________________________________________ __ _
+# __________________________________________________________________________________ __ _
 # get_git_version:
 # Obtain version string from git tags via git_describe and parse result into
 # convenient version variables.
 #
-# Tags have to be in the format .*([0-9]+)\.([0-9]+)\.([0-9]+)-(.*), as in
-# v1.2.3-rc5, where the expressions in parentheses are interpreted as major,
+# Tags have to match the regex ^[^0-9]*([0-9]+)\.([0-9]+)\.([0-9]+)-([0-9a-zA-Z]+),
+# as in v1.2.3-rc5, where the expressions in parentheses are interpreted as major,
 # minor, patch and extra (package release) version numbers.
 #
 # Usage:
@@ -20,24 +20,41 @@
 # <cptiglo@treefish.org> wrote this file.  As long as you retain this notice
 # you can do whatever you want with this stuff. If we meet some day, and you
 # think this stuff is worth it, you can buy me a beer in return.
-# __________________________________________________________________________ __ _
+# __________________________________________________________________________________ __ _
 
 function(get_git_version _gitversionprefix)
     include(GetGitRevisionDescription)
     git_describe(GIT_DESCRIPTION ${ARGN})
 
-    string(REGEX REPLACE "^[^0-9]*([0-9]+)\\..*" "\\1" VERSION_MAJOR "${GIT_DESCRIPTION}")
-    string(REGEX REPLACE "^[^0-9]*[0-9]+\\.([0-9]+).*" "\\1" VERSION_MINOR "${GIT_DESCRIPTION}")
-    string(REGEX REPLACE "^[^0-9]*[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" VERSION_PATCH "${GIT_DESCRIPTION}")
-    string(REGEX REPLACE "^[^0-9]*[0-9]+\\.[0-9]+\\.[0-9]+-(.*)" "\\1" VERSION_EXTRA "${GIT_DESCRIPTION}")
-    string(REGEX REPLACE "([^-]*-g)" "r\\1" VERSION_EXTRA "${VERSION_EXTRA}")
-    string(REGEX REPLACE "-" "." VERSION_EXTRA "${VERSION_EXTRA}")
+    string(REGEX REPLACE
+           "^[^0-9]*([0-9]+)\\..*" "\\1" VERSION_MAJOR "${GIT_DESCRIPTION}")
+    string(REGEX REPLACE
+           "^[^0-9]*[0-9]+\\.([0-9]+).*" "\\1" VERSION_MINOR "${GIT_DESCRIPTION}")
+    string(REGEX REPLACE
+           "^[^0-9]*[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" VERSION_PATCH "${GIT_DESCRIPTION}")
+    string(REGEX REPLACE
+           "^[^0-9]*[0-9]+\\.[0-9]+\\.[0-9]+-([0-9a-zA-Z-]+).*" "\\1" VERSION_EXTRA "${GIT_DESCRIPTION}")
+    string(REGEX REPLACE
+           "([^-]*-g)" "r\\1" VERSION_EXTRA "${VERSION_EXTRA}")
+    string(REGEX REPLACE
+           "-" "." VERSION_EXTRA "${VERSION_EXTRA}")
+	   
+    set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_EXTRA}")
 
+    if(NOT "${VERSION}" MATCHES
+       "^[0-9]+\\.[0-9]+\\.[0-9]+-[0-9a-zA-Z]+\\.?r?[0-9]*\\.?g?[0-9a-zA-Z]*$")
+
+        message(FATAL_ERROR 
+                "\nCOULD NOT EXTRACT VALID VERSION STRING FROM git_describe!"
+                "\n git_describe returned: \"${GIT_DESCRIPTION}\""
+                "\n Extracted invalid version string: \"${VERSION}\"\n")
+
+    endif(NOT "${VERSION}" MATCHES
+          "^[0-9]+\\.[0-9]+\\.[0-9]+-[0-9a-zA-Z]+\\.?r?[0-9]*\\.?g?[0-9a-zA-Z]*$")
+
+    set(${_gitversionprefix}       "${VERSION}"       PARENT_SCOPE)
     set(${_gitversionprefix}_MAJOR "${VERSION_MAJOR}" PARENT_SCOPE)
     set(${_gitversionprefix}_MINOR "${VERSION_MINOR}" PARENT_SCOPE)
     set(${_gitversionprefix}_PATCH "${VERSION_PATCH}" PARENT_SCOPE)
     set(${_gitversionprefix}_EXTRA "${VERSION_EXTRA}" PARENT_SCOPE)
-
-    set(${_gitversionprefix}
-	"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_EXTRA}" PARENT_SCOPE)
 endfunction()