diff --git a/third-party/benchmark/cmake/GetGitVersion.cmake b/third-party/benchmark/cmake/GetGitVersion.cmake --- a/third-party/benchmark/cmake/GetGitVersion.cmake +++ b/third-party/benchmark/cmake/GetGitVersion.cmake @@ -20,7 +20,7 @@ function(get_git_version var) if(GIT_EXECUTABLE) - execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --match "v[0-9]*.[0-9]*.[0-9]*" --abbrev=8 + execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --match "llvmorg-[0-9]*.[0-9]*.[0-9]*" --abbrev=8 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} RESULT_VARIABLE status OUTPUT_VARIABLE GIT_DESCRIBE_VERSION @@ -30,11 +30,7 @@ endif() string(STRIP ${GIT_DESCRIBE_VERSION} GIT_DESCRIBE_VERSION) - if(GIT_DESCRIBE_VERSION MATCHES v[^-]*-) - string(REGEX REPLACE "v([^-]*)-([0-9]+)-.*" "\\1.\\2" GIT_VERSION ${GIT_DESCRIBE_VERSION}) - else() - string(REGEX REPLACE "v(.*)" "\\1" GIT_VERSION ${GIT_DESCRIBE_VERSION}) - endif() + string(REGEX REPLACE "llvmorg-(.*)" "v\\1" GIT_VERSION ${GIT_DESCRIBE_VERSION}) # Work out if the repository is dirty execute_process(COMMAND ${GIT_EXECUTABLE} update-index -q --refresh @@ -49,7 +45,7 @@ if (${GIT_DIRTY}) set(GIT_DESCRIBE_VERSION "${GIT_DESCRIBE_VERSION}-dirty") endif() - message(STATUS "git version: ${GIT_DESCRIBE_VERSION} normalized to ${GIT_VERSION}") + message(STATUS "Git version: ${GIT_DESCRIBE_VERSION} normalized to ${GIT_VERSION}") else() set(GIT_VERSION "0.0.0") endif()