[Cmake-commits] CMake branch, master, updated. v3.5.2-672-gd3db070

[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  d3db070e9eb7890958ae2b9d91085f5c7c6770f8 (commit)
       via  f5089cfccd96f2c94838faa1736fa452ae4bb853 (commit)
       via  f7003a60557e828f08ee893c5da78b24423b5223 (commit)
      from  bc7598fde0e6d9322667f14be8d062b8ba68e666 (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=d3db070e9eb7890958ae2b9d91085f5c7c6770f8
commit d3db070e9eb7890958ae2b9d91085f5c7c6770f8
Merge: bc7598f f5089cf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 16 10:11:35 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 16 10:11:35 2016 -0400

    Merge topic 'cpack-rpm-adding-dist-to-release-tag'
    
    f5089cfc CPack/RPM adding dist to release tag test
    f7003a60 CPack/RPM release dist tag support

diff --cc Tests/RunCMake/CPack/RunCMakeTest.cmake
index 0f3fc57,7f756c4..759295f
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@@ -10,8 -10,6 +10,9 @@@ 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(RPM_DIST "RPM" 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-adding-dist-to-release-tag.rst   |    7 +++++
 Modules/CPackRPM.cmake                             |   27 +++++++++++++++++---
 ...tedFiles.cmake => RPM_DIST-ExpectedFiles.cmake} |    2 +-
 .../RunCMake/CPack/RPM/RPM_DIST-VerifyResult.cmake |   11 ++++++++
 Tests/RunCMake/CPack/RPM_DIST.cmake                |    4 +++
 Tests/RunCMake/CPack/RunCMakeTest.cmake            |    1 +
 6 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 Help/release/dev/cpack-rpm-adding-dist-to-release-tag.rst
 copy Tests/RunCMake/CPack/RPM/{MINIMAL-ExpectedFiles.cmake => RPM_DIST-ExpectedFiles.cmake} (79%)
 create mode 100644 Tests/RunCMake/CPack/RPM/RPM_DIST-VerifyResult.cmake
 create mode 100644 Tests/RunCMake/CPack/RPM_DIST.cmake


hooks/post-receive
-- 
CMake