diff options
author | Brad King <brad.king@kitware.com> | 2016-07-13 13:26:40 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-07-13 13:26:40 (GMT) |
commit | 4b726a3f5c8c323baa029fa6a39bfbb31aeba65d (patch) | |
tree | 35d07fe459e51a32de028e92f03b8edc71de9821 | |
parent | 602d95d16d72f18cd9ee8badac763943b95e30bf (diff) | |
parent | 672e6d2e20212b627085f035f65cb45d0c070d23 (diff) | |
download | CMake-4b726a3f5c8c323baa029fa6a39bfbb31aeba65d.zip CMake-4b726a3f5c8c323baa029fa6a39bfbb31aeba65d.tar.gz CMake-4b726a3f5c8c323baa029fa6a39bfbb31aeba65d.tar.bz2 |
Merge topic 'fix-cpack-rpm-different-package-names'
672e6d2e CPack/RPM: Add missed CPACK_RPM_FILE_NAME fallback variable
-rw-r--r-- | Modules/CPackRPM.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake index 7706bbc..eeb21b7 100644 --- a/Modules/CPackRPM.cmake +++ b/Modules/CPackRPM.cmake @@ -1803,6 +1803,7 @@ function(cpack_rpm_generate_package) endif() cpack_rpm_variable_fallback("CPACK_RPM_FILE_NAME" + "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_FILE_NAME" "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT_UPPER}_FILE_NAME" "CPACK_RPM_FILE_NAME") if(NOT CPACK_RPM_FILE_NAME STREQUAL "RPM-DEFAULT") |