From 0186d4619ba90237f864ce65fcb4fa5e45231796 Mon Sep 17 00:00:00 2001 From: sowle Date: Mon, 21 Sep 2020 14:39:21 +0300 Subject: [PATCH] fix "git describe" parsing regexp (issue with wrong commit id in build numbers) --- src/version.cmake | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/version.cmake b/src/version.cmake index 9bc0131c..828330d4 100644 --- a/src/version.cmake +++ b/src/version.cmake @@ -4,8 +4,7 @@ if(RET) set(VERSION "${COMMIT}") configure_file("src/version.h.in" "${TO}") else() - string(REGEX MATCH "([0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f])?(-dirty)? $" COMMIT "${DESCRIPTION} ") - string(STRIP "${COMMIT}" COMMIT) - set(VERSION "${COMMIT}") + string(REGEX MATCH "[^0-9a-f]([0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f])[0-9a-f]*(-dirty)?" STUB_VAR "${DESCRIPTION}") + set(VERSION "${CMAKE_MATCH_1}${CMAKE_MATCH_2}") configure_file("src/version.h.in" "${TO}") -endif() \ No newline at end of file +endif()