diff options
| author | Josh Blum <josh@joshknows.com> | 2011-04-14 11:54:19 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-04-14 11:54:19 -0700 |
| commit | d24d9d9bd9e6783aa1bb0692386e05f67c019329 (patch) | |
| tree | a5b08021c999d11e87a272b05855c1dd326f69b1 | |
| parent | 291a46b86e8e639b711a609134ace667235eeb91 (diff) | |
| download | uhd-d24d9d9bd9e6783aa1bb0692386e05f67c019329.tar.gz uhd-d24d9d9bd9e6783aa1bb0692386e05f67c019329.tar.bz2 uhd-d24d9d9bd9e6783aa1bb0692386e05f67c019329.zip | |
uhd: only set UHD_BUILD_INFO on successful return (also removed unused cruft)
| -rw-r--r-- | host/Modules/UHDVersion.cmake | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/host/Modules/UHDVersion.cmake b/host/Modules/UHDVersion.cmake index eb25db488..86d3133a8 100644 --- a/host/Modules/UHDVersion.cmake +++ b/host/Modules/UHDVersion.cmake @@ -42,34 +42,18 @@ ENDIF() IF(UHD_BUILD_INFO_DISCOVERY) - #grab the git log entry for the current head - EXECUTE_PROCESS( - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - COMMAND ${GIT_EXECUTABLE} log HEAD~..HEAD --date=raw -n1 - OUTPUT_VARIABLE _git_log OUTPUT_STRIP_TRAILING_WHITESPACE - ) - - #extract the timestamp from the git log entry - EXECUTE_PROCESS( - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - COMMAND ${PYTHON_EXECUTABLE} -c "import re; print re.match('^.*Date:\\s*(\\d*).*$', ''' ${_git_log} ''', re.MULTILINE | re.DOTALL).groups()[0]" - OUTPUT_VARIABLE _git_timestamp OUTPUT_STRIP_TRAILING_WHITESPACE - ) - - #format the timestamp into YYYY-MM-DD-HH-MM-SS - EXECUTE_PROCESS( - COMMAND ${PYTHON_EXECUTABLE} -c "import time; print time.strftime('%Y%m%d%H%M%S', time.gmtime(${_git_timestamp}))" - OUTPUT_VARIABLE _git_date OUTPUT_STRIP_TRAILING_WHITESPACE - ) - #grab the git ref id for the current head EXECUTE_PROCESS( WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD OUTPUT_VARIABLE _git_rev OUTPUT_STRIP_TRAILING_WHITESPACE + RESULT_VARIABLE _git_rev_result ) - SET(UHD_BUILD_INFO ${_git_rev}) + #only set the build info on success + IF(_git_rev_result EQUAL 0) + SET(UHD_BUILD_INFO ${_git_rev}) + ENDIF() ENDIF(UHD_BUILD_INFO_DISCOVERY) ######################################################################## |