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

Oscar Fuentes ofv at wanadoo.es
Wed Aug 4 19:22:51 PDT 2010


Author: ofv
Date: Wed Aug  4 21:22:51 2010
New Revision: 110301

URL: http://llvm.org/viewvc/llvm-project?rev=110301&view=rev
Log:
When building from git, add ref-id to PACKAGE_VERSION

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=110301&r1=110300&r2=110301&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/VersionFromVCS.cmake (original)
+++ llvm/trunk/cmake/modules/VersionFromVCS.cmake Wed Aug  4 21:22:51 2010
@@ -15,6 +15,19 @@
     endif()
   elseif( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git )
     set(result "${result}git")
+    # Try to get a ref-id
+    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)
+      if( git_result EQUAL 0 )
+	string(SUBSTRING ${git_output} 0 7 git_ref_id)
+	set(result "${result}-${git_ref_id}")
+      endif()
+    endif()
   endif()
   set(${VERS} ${result} PARENT_SCOPE)
 endfunction(add_version_info_from_vcs)





More information about the llvm-commits mailing list