[Cmake-commits] CMake branch, master, updated. v3.3.0-760-g2259080

Brad King brad.king at kitware.com
Thu Aug 6 09:38:34 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  22590805bffe74c3b4998152556561a2c2b6d177 (commit)
       via  94226751cb9beb7aa1939e9395d4999e30b30600 (commit)
       via  105011e08fafe23cb4cfd4fcb1468187f9d81f21 (commit)
       via  d882d4770fec6d65d82d818b4979cb5763d253c1 (commit)
       via  145735b748ab04505ab7a885a54fbd175ccecee2 (commit)
       via  e26f53a88b2fd16fc54513adfbb8eaab26dd102f (commit)
       via  64aacb24b65e5496b4148437ed96363ae06e8200 (commit)
      from  91c1b13d6e369190d6c8293d27cda1f6fba160d3 (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=22590805bffe74c3b4998152556561a2c2b6d177
commit 22590805bffe74c3b4998152556561a2c2b6d177
Merge: 91c1b13 9422675
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 6 09:38:33 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 6 09:38:33 2015 -0400

    Merge topic 'cpack-rpm-documentation-fixes'
    
    94226751 Tests/RunCMake/CPack: Add dependencies tests
    105011e0 Tests/RunCMake/CPack: Bump verify result cmake version
    d882d477 Tests/RunCMake/CPack/DEB: Add getPackageInfo helper function
    145735b7 Tests/RunCMake/CPack: Enable CXX language in tests
    e26f53a8 CPack/RPM: missing PACKAGE_CONFLICTS documentation
    64aacb24 CPack/RPM: undocumented variables


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

Summary of changes:
 Modules/CPackRPM.cmake                             |   73 ++++++++++++++++++++
 Tests/RunCMake/CPack/CMakeLists.txt                |    2 +-
 .../CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake     |   14 ++++
 .../CPack/DEB/DEPENDENCIES-VerifyResult.cmake      |   15 ++++
 .../CPack/DEB/DEPENDENCIES-specifics.cmake         |   15 ++++
 Tests/RunCMake/CPack/DEB/Helpers.cmake             |   10 +++
 Tests/RunCMake/CPack/DEPENDENCIES.cmake            |   18 +++++
 .../CPack/RPM/DEPENDENCIES-ExpectedFiles.cmake     |   13 ++++
 .../CPack/RPM/DEPENDENCIES-VerifyResult.cmake      |   45 ++++++++++++
 .../CPack/RPM/DEPENDENCIES-specifics.cmake         |   22 ++++++
 Tests/RunCMake/CPack/RunCMakeTest.cmake            |    1 +
 Tests/RunCMake/CPack/VerifyResult.cmake            |    2 +-
 12 files changed, 228 insertions(+), 2 deletions(-)
 create mode 100644 Tests/RunCMake/CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake
 create mode 100644 Tests/RunCMake/CPack/DEB/DEPENDENCIES-VerifyResult.cmake
 create mode 100644 Tests/RunCMake/CPack/DEB/DEPENDENCIES-specifics.cmake
 create mode 100644 Tests/RunCMake/CPack/DEPENDENCIES.cmake
 create mode 100644 Tests/RunCMake/CPack/RPM/DEPENDENCIES-ExpectedFiles.cmake
 create mode 100644 Tests/RunCMake/CPack/RPM/DEPENDENCIES-VerifyResult.cmake
 create mode 100644 Tests/RunCMake/CPack/RPM/DEPENDENCIES-specifics.cmake


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list