Make git-describe find annotated and non-annotated tags
Change-Id: I56f67e9a0a69fce3c825577160ab7380c297d243
This commit is contained in:
@@ -92,7 +92,7 @@ function(get_version DEFAULT_VERSION_STRING VERSION_PREFIX)
|
|||||||
find_program ( GIT NAMES git )
|
find_program ( GIT NAMES git )
|
||||||
|
|
||||||
if ( GIT )
|
if ( GIT )
|
||||||
execute_process ( COMMAND git describe --dirty --long --match ${VERSION_PREFIX}-[0-9.]*
|
execute_process ( COMMAND git describe --tags --dirty --long --match ${VERSION_PREFIX}-[0-9.]*
|
||||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
OUTPUT_VARIABLE GIT_TAG_STRING
|
OUTPUT_VARIABLE GIT_TAG_STRING
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||||
|
|||||||
Reference in New Issue
Block a user