aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Krause <vkrause@kde.org>2020-08-30 12:20:31 +0200
committerVolker Krause <vkrause@kde.org>2020-08-30 12:20:31 +0200
commit5c191fa1d2383c69ddc075395e04f84b7679613a (patch)
treeb36ab17e18406d6437a064c2ebdfb8820bcb2b55
parent3162c246000b1d54c237ad9e604689e3d27b9063 (diff)
downloadextra-cmake-modules-5c191fa1d2383c69ddc075395e04f84b7679613a.tar.gz
extra-cmake-modules-5c191fa1d2383c69ddc075395e04f84b7679613a.tar.bz2
Strip leading zeros from numerical version numbers in C++ codev5.74.0-rc1v5.74.0
Our August releases produce invalid octal numbers ("08") otherwise.
-rw-r--r--modules/ECMSetupVersion.cmake6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/ECMSetupVersion.cmake b/modules/ECMSetupVersion.cmake
index b8c660cf..65c1688a 100644
--- a/modules/ECMSetupVersion.cmake
+++ b/modules/ECMSetupVersion.cmake
@@ -133,9 +133,9 @@ function(ecm_setup_version _version)
set(_minor "${PROJECT_VERSION_MINOR}")
set(_patch "${PROJECT_VERSION_PATCH}")
else()
- string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" _major "${_version}")
- string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" _minor "${_version}")
- string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" _patch "${_version}")
+ 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}")
+ string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.0*([0-9]+).*" "\\1" _patch "${_version}")
endif()
if(NOT ESV_SOVERSION)