[llvm-commits] [llvm] r113405 - /llvm/trunk/cmake/modules/VersionFromVCS.cmake

[Michael J. Spencer]

Author: mspencer
Date: Wed Sep  8 15:49:40 2010
New Revision: 113405

URL: http://llvm.org/viewvc/llvm-project?rev=113405&view=rev
Log:
CMake: Use the svn revision information from git-svn if available.

Modified:
    llvm/trunk/cmake/modules/VersionFromVCS.cmake

Modified: llvm/trunk/cmake/modules/VersionFromVCS.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/VersionFromVCS.cmake?rev=113405&r1=113404&r2=113405&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/VersionFromVCS.cmake (original)
+++ llvm/trunk/cmake/modules/VersionFromVCS.cmake Wed Sep  8 15:49:40 2010
@@ -10,7 +10,7 @@
     if( Subversion_FOUND )
       subversion_wc_info( ${CMAKE_CURRENT_SOURCE_DIR} Project )
       if( Project_WC_REVISION )
-	set(result "${result}-r${Project_WC_REVISION}")
+        set(result "${result}-r${Project_WC_REVISION}")
       endif()
     endif()
   elseif( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git )
@@ -19,13 +19,23 @@
     find_program(git_executable NAMES git git.exe git.cmd)
     if( git_executable )
       execute_process(COMMAND ${git_executable} show-ref HEAD
-	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-	TIMEOUT 5
-	RESULT_VARIABLE git_result
-	OUTPUT_VARIABLE git_output)
+                      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                      TIMEOUT 5
+                      RESULT_VARIABLE git_result
+                      OUTPUT_VARIABLE git_output)
       if( git_result EQUAL 0 )
-	string(SUBSTRING ${git_output} 0 7 git_ref_id)
-	set(result "${result}-${git_ref_id}")
+        string(SUBSTRING ${git_output} 0 7 git_ref_id)
+        set(result "${result}-${git_ref_id}")
+      else()
+        execute_process(COMMAND ${git_executable} svn log --limit=1 --oneline
+                        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                        TIMEOUT 5
+                        RESULT_VARIABLE git_result
+                        OUTPUT_VARIABLE git_output)
+        if( git_result EQUAL 0 )
+          string(REGEX MATCH r[0-9]+ git_svn_rev ${git_output})
+          set(result "${result}-svn-${git_svn_rev}")
+        endif()
       endif()
     endif()
   endif()