From 4e498c920048fc2ecc719e71667d65d45316204b Mon Sep 17 00:00:00 2001 From: Viper Bailey Date: Mon, 4 Nov 2024 09:58:34 -0700 Subject: [PATCH] improvements to the inference of the version from the tag --- cmake/CPM.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/CPM.cmake b/cmake/CPM.cmake index 6e260791..dc3e0761 100644 --- a/cmake/CPM.cmake +++ b/cmake/CPM.cmake @@ -1167,12 +1167,12 @@ function(cpm_get_version_from_git_tag GIT_TAG RESULT) 0 PARENT_SCOPE ) - else() - string(REGEX MATCH "v?([0123456789.]*).*" _ ${GIT_TAG}) - set(${RESULT} - ${CMAKE_MATCH_1} - PARENT_SCOPE - ) + elseif(${GIT_TAG} MATCHES "v([0-9][0-9.]*)") + set(${RESULT} ${CMAKE_MATCH_1} PARENT_SCOPE) + + elseif(${GIT_TAG} MATCHES "([0-9]+\\.[0-9.]+)") + set(${RESULT} ${CMAKE_MATCH_1} PARENT_SCOPE) + endif() endfunction()