Revision 2033713d host/cmake/Modules/UHDVersion.cmake

b/host/cmake/Modules/UHDVersion.cmake
1 1
#
2
# Copyright 2010-2011 Ettus Research LLC
2
# Copyright 2010-2012 Ettus Research LLC
3 3
#
4 4
# This program is free software: you can redistribute it and/or modify
5 5
# it under the terms of the GNU General Public License as published by
......
45 45
    #grab the git ref id for the current head
46 46
    EXECUTE_PROCESS(
47 47
        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
48
        COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
49
        OUTPUT_VARIABLE _git_rev OUTPUT_STRIP_TRAILING_WHITESPACE
50
        RESULT_VARIABLE _git_rev_result
48
        COMMAND ${GIT_EXECUTABLE} describe --always --abbrev=8 --long
49
        OUTPUT_VARIABLE _git_describe OUTPUT_STRIP_TRAILING_WHITESPACE
50
        RESULT_VARIABLE _git_describe_result
51 51
    )
52 52

  
53 53
    #only set the build info on success
54
    IF(_git_rev_result EQUAL 0)
55
        SET(UHD_BUILD_INFO ${_git_rev})
54
    IF(_git_describe_result EQUAL 0)
55
        EXECUTE_PROCESS(
56
            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
57
            COMMAND ${PYTHON_EXECUTABLE} -c "print '${_git_describe}'.split('-',1)[1]"
58
            OUTPUT_VARIABLE UHD_BUILD_INFO OUTPUT_STRIP_TRAILING_WHITESPACE
59
        )
56 60
    ENDIF()
61

  
57 62
ENDIF(UHD_BUILD_INFO_DISCOVERY)
58 63

  
59 64
########################################################################
60
SET(UHD_VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_MINOR}.${UHD_VERSION_PATCH}")
65
SET(UHD_VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_MINOR}.${UHD_VERSION_PATCH}-${UHD_BUILD_INFO}")

Also available in: Unified diff