From ed3a19e64b8225f0edb1dacf764eb03ae88fb6d5 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 5 Aug 2021 13:28:48 +0200 Subject: Simplify the PROJECT_VERSION regex CMake rejects the project version if it contains anything but dots and numbers, there's no need to try to catch anything else. --- modules/ECMSetupVersion.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/ECMSetupVersion.cmake') diff --git a/modules/ECMSetupVersion.cmake b/modules/ECMSetupVersion.cmake index 0d950db5..73b71ed1 100644 --- a/modules/ECMSetupVersion.cmake +++ b/modules/ECMSetupVersion.cmake @@ -133,9 +133,9 @@ function(ecm_setup_version _version) if(use_project_version) set(_version "${PROJECT_VERSION}") # drop leading 0 from values to avoid bogus octal values in c/C++ e.g. with 08 or 09 - string(REGEX REPLACE "0*([0-9]+).*" "\\1" _major "${PROJECT_VERSION_MAJOR}") - string(REGEX REPLACE "0*([0-9]+).*" "\\1" _minor "${PROJECT_VERSION_MINOR}") - string(REGEX REPLACE "0*([0-9]+).*" "\\1" _patch "${PROJECT_VERSION_PATCH}") + string(REGEX REPLACE "0*([0-9]+)" "\\1" _major "${PROJECT_VERSION_MAJOR}") + string(REGEX REPLACE "0*([0-9]+)" "\\1" _minor "${PROJECT_VERSION_MINOR}") + string(REGEX REPLACE "0*([0-9]+)" "\\1" _patch "${PROJECT_VERSION_PATCH}") else() string(REGEX REPLACE "^0*([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" _major "${_version}") string(REGEX REPLACE "^[0-9]+\\.0*([0-9]+)\\.[0-9]+.*" "\\1" _minor "${_version}") -- cgit v1.2.1