[Cmake-commits] CMake branch, master, updated. v3.3.0-rc4-471-g536b6c7

Brad King brad.king at kitware.com
Fri Jul 17 10:36:16 EDT 2015


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  536b6c7519e221573cdf96db13b9d72b65c80b0b (commit)
       via  3e6b2ab6832f77a7e073b55331352a88a5d28488 (commit)
       via  506f6bc0d269653cbba27257b9fed350365037c3 (commit)
       via  32e9276a086c8ec78d0d6ff15bf576571118c3d7 (commit)
       via  47d1f1189c53f02010d16ef541835c016fd8302d (commit)
      from  386e1f796ca622e87f822b71e121c611cc184d47 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=536b6c7519e221573cdf96db13b9d72b65c80b0b
commit 536b6c7519e221573cdf96db13b9d72b65c80b0b
Merge: 386e1f7 3e6b2ab
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 17 10:36:15 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 17 10:36:15 2015 -0400

    Merge topic 'cpack-per-component-extra-control-file'
    
    3e6b2ab6 CPack/DEB: component version of PACKAGE_CONTROL_EXTRA
    506f6bc0 CPack/DEB: Remove duplicate string(TOUPPER) calls
    32e9276a Tests/RunCMake/CPack/DEB: add verifyDebControl
    47d1f118 Tests/RunCMake/CPack: found files should be preserved


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

Summary of changes:
 Modules/CPackDeb.cmake                             |   12 +++++++++---
 .../CPack/DEB/DEB_EXTRA-ExpectedFiles.cmake        |    9 +++++++++
 .../CPack/DEB/DEB_EXTRA-VerifyResult.cmake         |   11 +++++++++++
 Tests/RunCMake/CPack/DEB/Helpers.cmake             |   18 ++++++++++++++++++
 Tests/RunCMake/CPack/DEB_EXTRA.cmake               |   20 ++++++++++++++++++++
 Tests/RunCMake/CPack/RunCMakeTest.cmake            |    1 +
 Tests/RunCMake/CPack/VerifyResult.cmake            |   10 +++++-----
 7 files changed, 73 insertions(+), 8 deletions(-)
 create mode 100644 Tests/RunCMake/CPack/DEB/DEB_EXTRA-ExpectedFiles.cmake
 create mode 100644 Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake
 create mode 100644 Tests/RunCMake/CPack/DEB_EXTRA.cmake


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list