Merge branch 'release-0.2'

1 files changed, 14 insertions, 20 deletions

diff --git a/src/Version.cmake b/src/Version.cmake
index 9aa0720..6b9fb14 100644
--- a/src/Version.cmake
+++ b/src/Version.cmake
@@ -12,7 +12,12 @@ if(CastXML_VERSION_RC)
   set(CastXML_VERSION "${CastXML_VERSION}-rc${CastXML_VERSION_RC}")
 endif()
 
-if(EXISTS ${CastXML_SOURCE_DIR}/.git)
+# If this source was exported by 'git archive', use its commit info.
+set(git_info "$Format:%h %s$")
+
+# Otherwise, try to identify the current development source version.
+if(NOT git_info MATCHES "^([0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]?[0-9a-f]?)[0-9a-f]* "
+    AND EXISTS ${CastXML_SOURCE_DIR}/.git)
   find_package(Git QUIET)
   if(GIT_FOUND)
     macro(_git)
@@ -25,34 +30,23 @@ if(EXISTS ${CastXML_SOURCE_DIR}/.git)
         )
     endmacro()
   endif()
-endif()
 
-# Try to identify the current development source version.
-if(COMMAND _git)
-  # Get the commit checked out in this work tree.
-  _git(log -n 1 HEAD "--pretty=format:%h %s" --)
-  set(git_info "${_git_out}")
-else()
-  # Get the commit exported by 'git archive'.
-  set(git_info "$Format:%h %s$")
+  # Try to identify the current development source version.
+  if(COMMAND _git)
+    # Get the commit checked out in this work tree.
+    _git(log -n 1 HEAD "--pretty=format:%h %s" --)
+    set(git_info "${_git_out}")
+  endif()
 endif()
 
 # Extract commit information if available.
-if(git_info MATCHES "^([0-9a-f]+) (.*)$")
+if(git_info MATCHES "^([0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]?[0-9a-f]?)[0-9a-f]* (.*)$")
   set(git_hash "${CMAKE_MATCH_1}")
   set(git_subject "${CMAKE_MATCH_2}")
 
   # If this is not the exact commit of a release, add dev info.
   if(NOT "${git_subject}" MATCHES "^[Cc]ast[Xx][Mm][Ll] ${CastXML_VERSION}$")
-    set(git_suffix "-g${git_hash}")
-    if(COMMAND _git)
-      # Use version suffix computed by 'git describe' if this version has been tagged.
-      _git(describe --tags --match "v${CastXML_VERSION}" HEAD)
-      if(_git_out MATCHES "^v${CastXML_VERSION}(-[0-9]+-g[0-9a-f]+)?$")
-        set(git_suffix "${CMAKE_MATCH_1}")
-      endif()
-    endif()
-    set(CastXML_VERSION "${CastXML_VERSION}${git_suffix}")
+    set(CastXML_VERSION "${CastXML_VERSION}-g${git_hash}")
   endif()
 
   # If this is a work tree, check whether it is dirty.