Unverified Commit cf241d26 authored by Robert Kimball's avatar Robert Kimball Committed by GitHub

update git_tags to handle the case where there are no labels in the repo (#1906)

parent c62f2b23
...@@ -20,7 +20,8 @@ function(NGRAPH_GET_CURRENT_HASH) ...@@ -20,7 +20,8 @@ function(NGRAPH_GET_CURRENT_HASH)
COMMAND ${GIT_EXECUTABLE} rev-parse --verify HEAD COMMAND ${GIT_EXECUTABLE} rev-parse --verify HEAD
RESULT_VARIABLE result RESULT_VARIABLE result
OUTPUT_VARIABLE HASH OUTPUT_VARIABLE HASH
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
ERROR_QUIET)
string(STRIP ${HASH} HASH) string(STRIP ${HASH} HASH)
set(NGRAPH_CURRENT_HASH ${HASH} PARENT_SCOPE) set(NGRAPH_CURRENT_HASH ${HASH} PARENT_SCOPE)
...@@ -32,15 +33,20 @@ function(NGRAPH_GET_TAG_OF_CURRENT_HASH) ...@@ -32,15 +33,20 @@ function(NGRAPH_GET_TAG_OF_CURRENT_HASH)
COMMAND ${GIT_EXECUTABLE} ls-remote --tags COMMAND ${GIT_EXECUTABLE} ls-remote --tags
RESULT_VARIABLE RESULT RESULT_VARIABLE RESULT
OUTPUT_VARIABLE TAG_LIST OUTPUT_VARIABLE TAG_LIST
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
ERROR_QUIET)
NGRAPH_GET_CURRENT_HASH() NGRAPH_GET_CURRENT_HASH()
if (NOT ${TAG_LIST} STREQUAL "")
string(REGEX MATCH "${NGRAPH_CURRENT_HASH}\t[^\r\n]*" TAG ${TAG_LIST}) string(REGEX MATCH "${NGRAPH_CURRENT_HASH}\t[^\r\n]*" TAG ${TAG_LIST})
set(FINAL_TAG ${TAG}) set(FINAL_TAG ${TAG})
if (NOT "${TAG}" STREQUAL "") if (NOT "${TAG}" STREQUAL "")
string(REGEX REPLACE "${NGRAPH_CURRENT_HASH}\trefs/tags/(.*)" "\\1" FINAL_TAG ${TAG}) string(REGEX REPLACE "${NGRAPH_CURRENT_HASH}\trefs/tags/(.*)" "\\1" FINAL_TAG ${TAG})
endif() endif()
else()
set(FINAL_TAG "")
endif()
set(NGRAPH_CURRENT_RELEASE_TAG ${FINAL_TAG} PARENT_SCOPE) set(NGRAPH_CURRENT_RELEASE_TAG ${FINAL_TAG} PARENT_SCOPE)
endfunction() endfunction()
...@@ -50,9 +56,12 @@ function(NGRAPH_GET_MOST_RECENT_TAG) ...@@ -50,9 +56,12 @@ function(NGRAPH_GET_MOST_RECENT_TAG)
COMMAND ${GIT_EXECUTABLE} describe --tags --abbrev=0 COMMAND ${GIT_EXECUTABLE} describe --tags --abbrev=0
RESULT_VARIABLE RESULT RESULT_VARIABLE RESULT
OUTPUT_VARIABLE TAG OUTPUT_VARIABLE TAG
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
ERROR_QUIET)
if (NOT ${TAG} STREQUAL "")
string(STRIP ${TAG} TAG) string(STRIP ${TAG} TAG)
endif()
set(NGRAPH_MOST_RECENT_RELEASE_TAG ${TAG} PARENT_SCOPE) set(NGRAPH_MOST_RECENT_RELEASE_TAG ${TAG} PARENT_SCOPE)
endfunction() endfunction()
...@@ -63,6 +72,10 @@ function(NGRAPH_GET_VERSION_LABEL) ...@@ -63,6 +72,10 @@ function(NGRAPH_GET_VERSION_LABEL)
NGRAPH_GET_CURRENT_HASH() NGRAPH_GET_CURRENT_HASH()
NGRAPH_GET_MOST_RECENT_TAG() NGRAPH_GET_MOST_RECENT_TAG()
string(SUBSTRING "${NGRAPH_CURRENT_HASH}" 0 7 HASH) string(SUBSTRING "${NGRAPH_CURRENT_HASH}" 0 7 HASH)
if (NOT ${NGRAPH_MOST_RECENT_RELEASE_TAG} STREQUAL "")
set(NGRAPH_VERSION_LABEL "${NGRAPH_MOST_RECENT_RELEASE_TAG}+${HASH}" PARENT_SCOPE) set(NGRAPH_VERSION_LABEL "${NGRAPH_MOST_RECENT_RELEASE_TAG}+${HASH}" PARENT_SCOPE)
else()
set(NGRAPH_VERSION_LABEL "?.?.?+${HASH}" PARENT_SCOPE)
endif()
endif() endif()
endfunction() endfunction()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment