diff options
| author | Domen Vrankar <domen.vrankar@gmail.com> | 2017-09-21 05:53:42 (GMT) |
|---|---|---|
| committer | Domen Vrankar <domen.vrankar@gmail.com> | 2017-09-21 17:54:17 (GMT) |
| commit | 74b7457f12c943abd2c33aebc8ada5b50e331f50 (patch) | |
| tree | 9ffa8bfd02811f78ed6b6efe8776c739a6d4afb2 /Tests/RunCMake/CPack/VerifyResult.cmake | |
| parent | 821b54f4a6e1cebfc8d5c9b061c45683a4a5c6ba (diff) | |
| download | CMake-74b7457f12c943abd2c33aebc8ada5b50e331f50.zip CMake-74b7457f12c943abd2c33aebc8ada5b50e331f50.tar.gz CMake-74b7457f12c943abd2c33aebc8ada5b50e331f50.tar.bz2 | |
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/VerifyResult.cmake')
| -rw-r--r-- | Tests/RunCMake/CPack/VerifyResult.cmake | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Tests/RunCMake/CPack/VerifyResult.cmake b/Tests/RunCMake/CPack/VerifyResult.cmake index 470ebf7..1f5ab87 100644 --- a/Tests/RunCMake/CPack/VerifyResult.cmake +++ b/Tests/RunCMake/CPack/VerifyResult.cmake @@ -8,9 +8,7 @@ function(findExpectedFile FILE_NO RESULT_VAR GLOBING_EXPR_VAR) endif() if(NOT DEFINED EXPECTED_FILE_${FILE_NO}_VERSION) set(EXPECTED_FILE_${FILE_NO}_VERSION "0.1.1") - endif() - if(NOT DEFINED EXPECTED_FILE_${FILE_NO}_REVISION) - set(EXPECTED_FILE_${FILE_NO}_REVISION "1") + set(EXPECTED_FILE_${FILE_NO}_VERSION "0.1.1" PARENT_SCOPE) endif() getPackageNameGlobexpr("${EXPECTED_FILE_${FILE_NO}_NAME}" |