Teach the VCS detection to set some root-level variables with the raw

revision and git commit data extracted. This will be used in the Clang
CMake build to avoid trying to re-detect the information.

llvm-svn: 146324
This commit is contained in:
Chandler Carruth 2011-12-10 10:04:38 +00:00
parent 9ced850dfa
commit c60e3e19b5

View File

@ -13,6 +13,7 @@ function(add_version_info_from_vcs VERS)
if( Subversion_FOUND ) if( Subversion_FOUND )
subversion_wc_info( ${CMAKE_CURRENT_SOURCE_DIR} Project ) subversion_wc_info( ${CMAKE_CURRENT_SOURCE_DIR} Project )
if( Project_WC_REVISION ) if( Project_WC_REVISION )
set(SVN_REVISION ${Project_WC_REVISION} PARENT_SCOPE)
set(result "${result}-r${Project_WC_REVISION}") set(result "${result}-r${Project_WC_REVISION}")
endif() endif()
endif() endif()
@ -30,6 +31,7 @@ function(add_version_info_from_vcs VERS)
if( git_result EQUAL 0 ) if( git_result EQUAL 0 )
string(REGEX MATCH r[0-9]+ git_svn_rev ${git_output}) string(REGEX MATCH r[0-9]+ git_svn_rev ${git_output})
string(SUBSTRING "${git_svn_rev}" 1 -1 git_svn_rev_number) string(SUBSTRING "${git_svn_rev}" 1 -1 git_svn_rev_number)
set(SVN_REVISION ${git_svn_rev_number} PARENT_SCOPE)
set(git_svn_rev "-svn-${git_svn_rev}") set(git_svn_rev "-svn-${git_svn_rev}")
# Determine if the HEAD points directly at a subversion revision. # Determine if the HEAD points directly at a subversion revision.
@ -55,6 +57,7 @@ function(add_version_info_from_vcs VERS)
OUTPUT_VARIABLE git_output) OUTPUT_VARIABLE git_output)
if( git_result EQUAL 0 AND NOT is_git_svn_rev_exact ) if( git_result EQUAL 0 AND NOT is_git_svn_rev_exact )
string(STRIP "${git_output}" git_ref_id) string(STRIP "${git_output}" git_ref_id)
set(GIT_COMMIT ${git_ref_id} PARENT_SCOPE)
set(result "${result}${git_svn_rev}-${git_ref_id}") set(result "${result}${git_svn_rev}-${git_ref_id}")
else() else()
set(result "${result}${git_svn_rev}") set(result "${result}${git_svn_rev}")