diff options
| author | Brad King <brad.king@kitware.com> | 2017-01-09 21:27:31 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-01-09 21:27:31 (GMT) |
| commit | eee51e24d2290771ad3dded566ef897243f21331 (patch) | |
| tree | bbe656924aef5ca5ef4fdfebb39b55edfd0cb9e5 | |
| parent | 4ce6cd2bcfa847fe2e9926d97f27be1d89fe1c4b (diff) | |
| parent | 2f4e5ed66dc34a5f4ecb80d38d291d1e78ac12f7 (diff) | |
| download | CMake-eee51e24d2290771ad3dded566ef897243f21331.zip CMake-eee51e24d2290771ad3dded566ef897243f21331.tar.gz CMake-eee51e24d2290771ad3dded566ef897243f21331.tar.bz2 | |
Merge topic 'cpack-deb-package-version-override-fix'
2f4e5ed6 CPackDeb: use CPACK_DEBIAN_PACKAGE_VERSION
| -rw-r--r-- | Modules/CPackDeb.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index bee69d9..ddf8b23 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -914,7 +914,7 @@ function(cpack_deb_prepare_package_vars) extract_so_info("${_FILE}" libname soversion) if(libname AND soversion) list(APPEND CPACK_DEBIAN_PACKAGE_SHLIBS_LIST - "${libname} ${soversion} ${CPACK_DEBIAN_PACKAGE_NAME} (${CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY} ${CPACK_PACKAGE_VERSION})") + "${libname} ${soversion} ${CPACK_DEBIAN_PACKAGE_NAME} (${CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY} ${CPACK_DEBIAN_PACKAGE_VERSION})") else() message(AUTHOR_WARNING "Shared library '${_FILE}' is missing soname or soversion. Library will not be added to DEBIAN/shlibs control file.") endif() @@ -967,7 +967,7 @@ function(cpack_deb_prepare_package_vars) # Patch package file name to be in corrent debian format: # <foo>_<VersionNumber>-<DebianRevisionNumber>_<DebianArchitecture>.deb set(CPACK_OUTPUT_FILE_NAME - "${CPACK_DEBIAN_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb") + "${CPACK_DEBIAN_PACKAGE_NAME}_${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb") else() cmake_policy(PUSH) cmake_policy(SET CMP0010 NEW) |