[Cmake-commits] CMake branch, master, updated. v3.5.2-669-gbc7598f

[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, master has been updated
       via  bc7598fde0e6d9322667f14be8d062b8ba68e666 (commit)
       via  44ee2d717a0f0552d4d1d5978c473d60625a0b3c (commit)
      from  2b25174da6d99143eae7c47329d9d0bc7a3ede5d (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=bc7598fde0e6d9322667f14be8d062b8ba68e666
commit bc7598fde0e6d9322667f14be8d062b8ba68e666
Merge: 2b25174 44ee2d7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 16 10:11:32 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 16 10:11:32 2016 -0400

    Merge topic 'cpack-rpm-different-package-names'
    
    44ee2d71 CPack/RPM different package names

diff --cc Tests/RunCMake/CPack/RunCMakeTest.cmake
index 2e358f0,d34e751..0f3fc57
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@@ -10,7 -10,6 +10,8 @@@ run_cpack_test(DEB_EXTRA "DEB" false
  run_cpack_test(DEPENDENCIES "RPM;DEB" true)
  run_cpack_test(EMPTY_DIR "RPM;DEB;TGZ" true)
  run_cpack_test(COMPONENTS_EMPTY_DIR "RPM;DEB;TGZ" true)
+ run_cpack_test(RPM_CUSTOM_NAMES "RPM" true)
  run_cpack_test(PER_COMPONENT_FIELDS "RPM;DEB" false)
  run_cpack_test(INSTALL_SCRIPTS "RPM" false)
 +run_cpack_test(DEB_GENERATE_SHLIBS "DEB" true)
 +run_cpack_test(DEB_GENERATE_SHLIBS_LDCONFIG "DEB" true)

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

Summary of changes:
 .../dev/cpack-rpm-different-package-names.rst      |    9 +++
 Modules/CPackRPM.cmake                             |   68 +++++++++++++++++-
 Source/CPack/cmCPackRPMGenerator.cxx               |   72 ++++++++++++--------
 Source/CPack/cmCPackRPMGenerator.h                 |    3 +-
 .../RunCPackVerifyResult.cmake                     |    2 +-
 ....cmake => RPM_CUSTOM_NAMES-ExpectedFiles.cmake} |    6 +-
 .../RunCMake/CPack/RPM/RPM_CUSTOM_NAMES-stderr.txt |    3 +
 Tests/RunCMake/CPack/RPM_CUSTOM_NAMES.cmake        |   11 +++
 Tests/RunCMake/CPack/RunCMakeTest.cmake            |    1 +
 9 files changed, 137 insertions(+), 38 deletions(-)
 create mode 100644 Help/release/dev/cpack-rpm-different-package-names.rst
 copy Tests/RunCMake/CPack/RPM/{PER_COMPONENT_FIELDS-ExpectedFiles.cmake => RPM_CUSTOM_NAMES-ExpectedFiles.cmake} (67%)
 create mode 100644 Tests/RunCMake/CPack/RPM/RPM_CUSTOM_NAMES-stderr.txt
 create mode 100644 Tests/RunCMake/CPack/RPM_CUSTOM_NAMES.cmake


hooks/post-receive
-- 
CMake