[Cmake-commits] CMake branch, next, updated. v3.6.0-769-g18e430b

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  18e430bee9d9f446d6aa07707001931fbe879742 (commit)
       via  672e6d2e20212b627085f035f65cb45d0c070d23 (commit)
      from  b7f5b9abc529c6de5848106a49f0625ae1218f2f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18e430bee9d9f446d6aa07707001931fbe879742
commit 18e430bee9d9f446d6aa07707001931fbe879742
Merge: b7f5b9a 672e6d2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 11 11:20:51 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 11 11:20:51 2016 -0400

    Merge topic 'fix-cpack-rpm-different-package-names' into next
    
    672e6d2e CPack/RPM: Add missed CPACK_RPM_FILE_NAME fallback variable


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=672e6d2e20212b627085f035f65cb45d0c070d23
commit 672e6d2e20212b627085f035f65cb45d0c070d23
Author:     Alex Turbov <i.zaufi at gmail.com>
AuthorDate: Mon Jul 11 12:48:22 2016 +0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 11 11:19:24 2016 -0400

    CPack/RPM: Add missed CPACK_RPM_FILE_NAME fallback variable
    
    In commit v3.6.0-rc1~66^2 (CPack/RPM different package names,
    2016-05-15) we forgot the non-uppercased fallback variable name
    `CPACK_RPM_<COMPONENT>_FILE_NAME`.  Add it now.

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")

-----------------------------------------------------------------------

Summary of changes:
 Modules/CPackRPM.cmake |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake