Changeset - 8d17eb8be5a4
[Not reviewed]
default
0 1 0
Hasan Yavuz Ă–ZDERYA - 8 years ago 2017-05-05 08:01:22
hy@ozderya.net
fix get version for the case that there is a mercurial repo but no tag

in such case hg returns "null" tag
1 file changed with 7 insertions and 3 deletions:
0 comments (0 inline, 0 general)
cmake/modules/GetVersion.cmake
Show inline comments
 
@@ -27,9 +27,13 @@ if (HG)
 
    RESULT_VARIABLE HG_RESULT
 
    OUTPUT_VARIABLE HG_LATEST_TAG
 
    OUTPUT_STRIP_TRAILING_WHITESPACE)
 
  if(NOT HG_RESULT EQUAL 0)
 
  if(HG_RESULT EQUAL 0)
 
    if (NOT HG_LATEST_TAG MATCHES "v[0-9.]+")
 
      unset(HG_LATEST_TAG)
 
    endif()
 
  else()
 
    unset(HG_LATEST_TAG)
 
  endif(NOT HG_RESULT EQUAL 0)
 
  endif()
 

	
 
  # get revision
 
  execute_process(COMMAND ${HG} id -i
 
@@ -58,7 +62,7 @@ if (NOT HG_LATEST_TAG)
 
endif ()
 

	
 
# extract version information from tag (remove 'v' prefix)
 
if (NOT ${HG_LATEST_TAG} STREQUAL "")
 
if (HG_LATEST_TAG)
 
  string(REPLACE "v" "" HG_VERSION ${HG_LATEST_TAG})
 
  message("Version from mercurial: ${HG_VERSION} (${HG_REVISION})")
 

	
0 comments (0 inline, 0 general)