diff options
| author | Christophe Giboudeaux <christophe@krop.fr> | 2021-08-05 13:09:12 +0200 |
|---|---|---|
| committer | Christophe Giboudeaux <christophe@krop.fr> | 2021-08-05 13:09:12 +0200 |
| commit | f0790f9103e9df3b5d16f9866b4252ad023ed84d (patch) | |
| tree | ebefb12e48271fd8c5f74e9a369764abca830408 | |
| parent | a0f8e5469f388840d99aa8e8ff6f404cc16a66ad (diff) | |
| download | extra-cmake-modules-f0790f9103e9df3b5d16f9866b4252ad023ed84d.tar.gz extra-cmake-modules-f0790f9103e9df3b5d16f9866b4252ad023ed84d.tar.bz2 | |
Handle case where zero must be kept
This is required for the frameworks versions
Amends: a0f8e54
| -rw-r--r-- | modules/ECMSetupVersion.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/ECMSetupVersion.cmake b/modules/ECMSetupVersion.cmake index bf9eb7ca..0d950db5 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+" "" _major "${PROJECT_VERSION_MAJOR}") - string(REGEX REPLACE "^0+" "" _minor "${PROJECT_VERSION_MINOR}") - string(REGEX REPLACE "^0+" "" _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}") |