diff options
| author | Robert Maynard <rmaynard@nvidia.com> | 2021-05-27 18:14:49 (GMT) |
|---|---|---|
| committer | Robert Maynard <rmaynard@nvidia.com> | 2021-05-27 19:18:37 (GMT) |
| commit | e609afeb5f4385755a6d0f2fdb45fcdfb0a01b7a (patch) | |
| tree | 375cfa4058b154ec4f5673310e460aa728e1175f /Modules/BasicConfigVersion-SameMinorVersion.cmake.in | |
| parent | c5657a2fe42a0de7a5724507888f9f6f1afff8ea (diff) | |
| download | CMake-e609afeb5f4385755a6d0f2fdb45fcdfb0a01b7a.zip CMake-e609afeb5f4385755a6d0f2fdb45fcdfb0a01b7a.tar.gz CMake-e609afeb5f4385755a6d0f2fdb45fcdfb0a01b7a.tar.bz2 | |
WriteBasicConfigVersion supports version strings such as 21.07.04
Fixes #22207
Diffstat (limited to 'Modules/BasicConfigVersion-SameMinorVersion.cmake.in')
| -rw-r--r-- | Modules/BasicConfigVersion-SameMinorVersion.cmake.in | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Modules/BasicConfigVersion-SameMinorVersion.cmake.in b/Modules/BasicConfigVersion-SameMinorVersion.cmake.in index 9bb2efc..ef21df6 100644 --- a/Modules/BasicConfigVersion-SameMinorVersion.cmake.in +++ b/Modules/BasicConfigVersion-SameMinorVersion.cmake.in @@ -19,6 +19,13 @@ else() if("@CVF_VERSION@" MATCHES "^([0-9]+)\\.([0-9]+)") set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}") set(CVF_VERSION_MINOR "${CMAKE_MATCH_2}") + + if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0) + string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}") + endif() + if(NOT CVF_VERSION_MINOR VERSION_EQUAL 0) + string(REGEX REPLACE "^0+" "" CVF_VERSION_MINOR "${CVF_VERSION_MINOR}") + endif() else() set(CVF_VERSION_MAJOR "@CVF_VERSION@") set(CVF_VERSION_MINOR "") @@ -44,6 +51,13 @@ else() set(PACKAGE_VERSION_COMPATIBLE FALSE) endif() else() + if(NOT PACKAGE_FIND_VERSION_MAJOR VERSION_EQUAL 0) + string(REGEX REPLACE "^0+" "" PACKAGE_FIND_VERSION_MAJOR "${PACKAGE_FIND_VERSION_MAJOR}") + endif() + if(NOT PACKAGE_FIND_VERSION_MINOR VERSION_EQUAL 0) + string(REGEX REPLACE "^0+" "" PACKAGE_FIND_VERSION_MINOR "${PACKAGE_FIND_VERSION_MINOR}") + endif() + if((PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR) AND (PACKAGE_FIND_VERSION_MINOR STREQUAL CVF_VERSION_MINOR)) set(PACKAGE_VERSION_COMPATIBLE TRUE) |