summaryrefslogtreecommitdiff
path: root/Tests/RunCMake/CPack/RPM
diff options
context:
space:
mode:
authorDomen Vrankar <domen.vrankar@gmail.com>2017-09-21 07:53:42 +0200
committerDomen Vrankar <domen.vrankar@gmail.com>2017-09-21 19:54:17 +0200
commit74b7457f12c943abd2c33aebc8ada5b50e331f50 (patch)
tree9ffa8bfd02811f78ed6b6efe8776c739a6d4afb2 /Tests/RunCMake/CPack/RPM
parent821b54f4a6e1cebfc8d5c9b061c45683a4a5c6ba (diff)
downloadcmake-74b7457f12c943abd2c33aebc8ada5b50e331f50.tar.gz
CPack RPM and DEB: improved package version handling
Adds support for epoch version to CPackRPM and CPackDeb packagers. Also adds better version checking to CPackDeb that complies with Debian rules. Fixes: #17057
Diffstat (limited to 'Tests/RunCMake/CPack/RPM')
-rw-r--r--Tests/RunCMake/CPack/RPM/Helpers.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/Tests/RunCMake/CPack/RPM/Helpers.cmake b/Tests/RunCMake/CPack/RPM/Helpers.cmake
index d8012b11bb..88fc231543 100644
--- a/Tests/RunCMake/CPack/RPM/Helpers.cmake
+++ b/Tests/RunCMake/CPack/RPM/Helpers.cmake
@@ -23,6 +23,9 @@ function(getPackageNameGlobexpr NAME COMPONENT VERSION REVISION FILE_NO RESULT_V
endif()
if(GENERATOR_SPECIFIC_FORMAT)
+ if(NOT REVISION)
+ set(REVISION "1")
+ endif()
set(${RESULT_VAR} "${NAME}${COMPONENT}-${VERSION}-${REVISION}.*.rpm" PARENT_SCOPE)
else()
set(${RESULT_VAR} "${NAME}-${VERSION}-*${COMPONENT}.rpm" PARENT_SCOPE)