diff options
| author | Brad King <brad.king@kitware.com> | 2016-07-11 15:21:01 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-07-11 15:21:01 (GMT) |
| commit | c7159e3f090322c9cec655eb0d596db263f7ee84 (patch) | |
| tree | 658583a8f33e0a7055ea4f7d53157946cbc67967 | |
| parent | 2bef0758e8974fe84db1dc24dc0a50d6c88ace1d (diff) | |
| parent | 672e6d2e20212b627085f035f65cb45d0c070d23 (diff) | |
| download | CMake-c7159e3f090322c9cec655eb0d596db263f7ee84.zip CMake-c7159e3f090322c9cec655eb0d596db263f7ee84.tar.gz CMake-c7159e3f090322c9cec655eb0d596db263f7ee84.tar.bz2 | |
Merge branch 'fix-cpack-rpm-different-package-names' into release
| -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 d231ff0..9cc496f 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") |