diff options
| author | Domen Vrankar <domen.vrankar@gmail.com> | 2016-09-05 21:58:33 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-09-07 13:33:35 (GMT) |
| commit | 332b089ad213a1aa89658fffd8f68c9064c6d3db (patch) | |
| tree | fdbba37d62d8de80133774818018d7d02f695b98 /Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description2.cmake | |
| parent | 8317ea01aa3cf9319ef907e127fa6dbf9666cc53 (diff) | |
| download | CMake-332b089ad213a1aa89658fffd8f68c9064c6d3db.zip CMake-332b089ad213a1aa89658fffd8f68c9064c6d3db.tar.gz CMake-332b089ad213a1aa89658fffd8f68c9064c6d3db.tar.bz2 | |
CPack/DEB: Make package description variable precedence match RPM
Make `CPACK_DEBIAN_PACKAGE_DESCRIPTION` fallback variable precedence
match CPackRPM behavior as much as possible. This is technically a
breaking change, but the new behavior is more consistent with
expectation anyway.
Closes: #16272
Diffstat (limited to 'Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description2.cmake')
| -rw-r--r-- | Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description2.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description2.cmake b/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description2.cmake index 35ca74c..7b94ca0 100644 --- a/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description2.cmake +++ b/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description2.cmake @@ -55,12 +55,12 @@ if(DPKGDEB_EXECUTABLE) message(STATUS "package='${dpkg_package_name}', description='${dpkg_description}'") if("${dpkg_package_name}" STREQUAL "mylib-applications") - if(NOT "${dpkg_description}" STREQUAL "main description 2") + if(NOT "${dpkg_description}" STREQUAL "Debian package description file") set(dpkgdeb_output_errors_all ${dpkgdeb_output_errors_all} "dpkg-deb: ${_f}: Incorrect description for package ${dpkg_package_name}: ${dpkg_description} != applications_description") endif() elseif("${dpkg_package_name}" STREQUAL "mylib-headers") - if(NOT "${dpkg_description}" STREQUAL "main description 2") + if(NOT "${dpkg_description}" STREQUAL "Debian package description file") set(dpkgdeb_output_errors_all ${dpkgdeb_output_errors_all} "dpkg-deb: ${_f}: Incorrect description for package ${dpkg_package_name}: ${dpkg_description} != headers_description") endif() |