diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-15 17:19:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-08-15 17:19:53 (GMT) |
| commit | 8ebd590b211c26ea9a35a33d6f019e1909e0283c (patch) | |
| tree | d31c43c4ffa37f292eaa4800d31b50da98d9d9fe /Modules | |
| parent | f2cab9855bf5a041379e3a5bbdd26ca3ddeab87a (diff) | |
| parent | a17ef5748abc8ef5d3117b5c6c8138ef1cdc9719 (diff) | |
| download | CMake-8ebd590b211c26ea9a35a33d6f019e1909e0283c.zip CMake-8ebd590b211c26ea9a35a33d6f019e1909e0283c.tar.gz CMake-8ebd590b211c26ea9a35a33d6f019e1909e0283c.tar.bz2 | |
Merge topic 'cpack-deb-ipk'
a17ef574 CPackDeb: Loosen filename requirement to allow for .ipk
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1093
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CPackDeb.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index daba7d5..85d564e 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -73,7 +73,8 @@ # # <PackageName>_<VersionNumber>-<DebianRevisionNumber>_<DebianArchitecture>.deb # -# Alternatively provided package file name must end with ``.deb`` suffix. +# Alternatively provided package file name must end +# with either ``.deb`` or ``.ipk`` suffix. # # .. note:: # @@ -977,9 +978,9 @@ function(cpack_deb_prepare_package_vars) else() cmake_policy(PUSH) cmake_policy(SET CMP0010 NEW) - if(NOT CPACK_DEBIAN_FILE_NAME MATCHES ".*\\.deb") + if(NOT CPACK_DEBIAN_FILE_NAME MATCHES ".*\\.(deb|ipk)") cmake_policy(POP) - message(FATAL_ERROR "'${CPACK_DEBIAN_FILE_NAME}' is not a valid DEB package file name as it must end with '.deb'!") + message(FATAL_ERROR "'${CPACK_DEBIAN_FILE_NAME}' is not a valid DEB package file name as it must end with '.deb' or '.ipk'!") endif() cmake_policy(POP) |