diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-11 12:26:07 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-10-11 12:26:24 (GMT) |
| commit | 4594880be7493096f9fe57eec46bf51a973257e2 (patch) | |
| tree | 59d35a54e2673451b1d13e77d289747ef4e3b70c /Modules | |
| parent | 5fd0ce61f71ff84c51e1ad25ebd53fd1e2444d8c (diff) | |
| parent | c5db2f9a0f62756e931d8dcfe0678a9d5bbe99a0 (diff) | |
| download | CMake-4594880be7493096f9fe57eec46bf51a973257e2.zip CMake-4594880be7493096f9fe57eec46bf51a973257e2.tar.gz CMake-4594880be7493096f9fe57eec46bf51a973257e2.tar.bz2 | |
Merge topic 'cpack-deb-mr-1296-fix'
c5db2f9a CPack/Deb: fix for regex passing even if invalid characters are present
529729d6 CPack/Deb: CPACK_DEBIAN_PACKAGE_VERSION regex testing exception
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1375
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CPackDeb.cmake | 39 |
1 files changed, 33 insertions, 6 deletions
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index 337bec8..1879827 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -110,6 +110,14 @@ # :variable:`CPACK_DEBIAN_PACKAGE_RELEASE` is not set then hyphens are not # allowed. # +# .. note:: +# +# For backward compatibility with CMake 3.9 and lower a failed test of this +# variable's content is not a hard error when both +# :variable:`CPACK_DEBIAN_PACKAGE_RELEASE` and +# :variable:`CPACK_DEBIAN_PACKAGE_EPOCH` variables are not set. An author +# warning is reported instead. +# # .. variable:: CPACK_DEBIAN_PACKAGE_RELEASE # # The Debian package release - Debian revision number. @@ -753,9 +761,22 @@ function(cpack_deb_prepare_package_vars) set(CPACK_DEBIAN_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION}) endif() - if(NOT CPACK_DEBIAN_PACKAGE_VERSION MATCHES "^[0-9][A-Za-z0-9.+-~]*$") - message(FATAL_ERROR - "CPackDeb: Debian package version must confirm to \"^[0-9][A-Za-z0-9.+-~]*$\" regex!") + if(DEFINED CPACK_DEBIAN_PACKAGE_RELEASE OR DEFINED CPACK_DEBIAN_PACKAGE_EPOCH) + # only test the version format if CPACK_DEBIAN_PACKAGE_RELEASE or + # CPACK_DEBIAN_PACKAGE_EPOCH is set + if(NOT CPACK_DEBIAN_PACKAGE_VERSION MATCHES "^[0-9][A-Za-z0-9.+~-]*$") + message(FATAL_ERROR + "CPackDeb: Debian package version must confirm to \"^[0-9][A-Za-z0-9.+~-]*$\" regex!") + endif() + else() + # before CMake 3.10 version format was not tested so only warn to preserve + # backward compatibility + if(NOT CPACK_DEBIAN_PACKAGE_VERSION MATCHES "^([0-9]+:)?[0-9][A-Za-z0-9.+~-]*$") + message(AUTHOR_WARNING + "CPackDeb: Debian package versioning ([<epoch>:]<version>[-<release>])" + " should confirm to \"^([0-9]+:)?[0-9][A-Za-z0-9.+~-]*$\" regex in" + " order to satisfy Debian packaging rules.") + endif() endif() if(CPACK_DEBIAN_PACKAGE_RELEASE) @@ -765,9 +786,15 @@ function(cpack_deb_prepare_package_vars) endif() string(APPEND CPACK_DEBIAN_PACKAGE_VERSION "-${CPACK_DEBIAN_PACKAGE_RELEASE}") - elseif(CPACK_DEBIAN_PACKAGE_VERSION MATCHES ".*-.*") - message(FATAL_ERROR - "CPackDeb: Debian package version must not contain hyphens when CPACK_DEBIAN_PACKAGE_RELEASE is not provided!") + elseif(DEFINED CPACK_DEBIAN_PACKAGE_EPOCH) + # only test the version format if CPACK_DEBIAN_PACKAGE_RELEASE or + # CPACK_DEBIAN_PACKAGE_EPOCH is set - versions CPack/Deb generator before + # CMake 3.10 did not check for version format so we have to preserve + # backward compatibility + if(CPACK_DEBIAN_PACKAGE_VERSION MATCHES ".*-.*") + message(FATAL_ERROR + "CPackDeb: Debian package version must not contain hyphens when CPACK_DEBIAN_PACKAGE_RELEASE is not provided!") + endif() endif() if(CPACK_DEBIAN_PACKAGE_EPOCH) |