[Cmake-commits] CMake branch, master, updated. v3.3.0-rc2-165-gb6b4a1c

[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  b6b4a1cb12c6aed2637961f380247f8234e864ef (commit)
       via  5f61ed991b3b6b9f61edc97a10b257d3343c7302 (commit)
       via  e726fc025a3543c0be8a4eb217b0a80f9c16051c (commit)
      from  157396b131c3d7f5c7324972afaf3e185ee726b5 (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=b6b4a1cb12c6aed2637961f380247f8234e864ef
commit b6b4a1cb12c6aed2637961f380247f8234e864ef
Merge: 157396b 5f61ed9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 16 10:39:08 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 16 10:39:08 2015 -0400

    Merge topic 'cpack-rpm-and-deb-runcmake-tests'
    
    5f61ed99 Tests: Move RunCMake.CPackRPM case into RunCMake.CPack_RPM test
    e726fc02 Tests: Add RunCMake tests for CPack{Deb,RPM}

diff --cc Tests/RunCMake/CMakeLists.txt
index 2a4108f,74bbf38..4543908
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@@ -232,5 -261,6 +261,7 @@@ endif(
  if("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
    add_executable(pseudo_iwyu pseudo_iwyu.c)
    add_RunCMake_test(IncludeWhatYouUse -DPSEUDO_IWYU=$<TARGET_FILE:pseudo_iwyu>)
 +  add_RunCMake_test(CompilerLauncher)
  endif()
+ 
+ add_RunCMake_test_group(CPack "DEB;RPM")

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

Summary of changes:
 Tests/RunCMake/CMakeLists.txt                      |   39 +++++++-
 Tests/RunCMake/CPack/CMakeLists.txt                |   12 +++
 Tests/RunCMake/CPack/CPackTestHelpers.cmake        |   76 +++++++++++++++
 Tests/RunCMake/CPack/DEB/Helpers.cmake             |   10 ++
 .../RunCMake/CPack/DEB/MINIMAL-ExpectedFiles.cmake |    5 +
 Tests/RunCMake/CPack/DEB/MINIMAL-specifics.cmake   |    1 +
 Tests/RunCMake/CPack/DEB/Prerequirements.cmake     |    8 ++
 Tests/RunCMake/CPack/MINIMAL.cmake                 |    3 +
 .../PARTIALLY_RELOCATABLE_WARNING.cmake}           |    0
 Tests/RunCMake/CPack/PreTestError.cmake            |    7 ++
 Tests/RunCMake/CPack/README.txt                    |   99 ++++++++++++++++++++
 Tests/RunCMake/CPack/RPM/Helpers.cmake             |   10 ++
 .../RunCMake/CPack/RPM/MINIMAL-ExpectedFiles.cmake |    5 +
 Tests/RunCMake/CPack/RPM/MINIMAL-stderr.txt        |    1 +
 ...RTIALLY_RELOCATABLE_WARNING-ExpectedFiles.cmake |    5 +
 .../RPM/PARTIALLY_RELOCATABLE_WARNING-stderr.txt}  |    0
 Tests/RunCMake/CPack/RPM/Prerequirements.cmake     |   16 ++++
 Tests/RunCMake/CPack/RunCMakeTest.cmake            |    8 ++
 Tests/RunCMake/CPack/VerifyResult.cmake            |   91 ++++++++++++++++++
 Tests/RunCMake/CPackRPM/CMakeLists.txt             |    7 --
 Tests/RunCMake/CPackRPM/RunCMakeTest.cmake         |   17 ----
 21 files changed, 392 insertions(+), 28 deletions(-)
 create mode 100644 Tests/RunCMake/CPack/CMakeLists.txt
 create mode 100644 Tests/RunCMake/CPack/CPackTestHelpers.cmake
 create mode 100644 Tests/RunCMake/CPack/DEB/Helpers.cmake
 create mode 100644 Tests/RunCMake/CPack/DEB/MINIMAL-ExpectedFiles.cmake
 create mode 100644 Tests/RunCMake/CPack/DEB/MINIMAL-specifics.cmake
 create mode 100644 Tests/RunCMake/CPack/DEB/Prerequirements.cmake
 create mode 100644 Tests/RunCMake/CPack/MINIMAL.cmake
 rename Tests/RunCMake/{CPackRPM/CPackRPM_PARTIALLY_RELOCATABLE_WARNING.cmake => CPack/PARTIALLY_RELOCATABLE_WARNING.cmake} (100%)
 create mode 100644 Tests/RunCMake/CPack/PreTestError.cmake
 create mode 100644 Tests/RunCMake/CPack/README.txt
 create mode 100644 Tests/RunCMake/CPack/RPM/Helpers.cmake
 create mode 100644 Tests/RunCMake/CPack/RPM/MINIMAL-ExpectedFiles.cmake
 create mode 100644 Tests/RunCMake/CPack/RPM/MINIMAL-stderr.txt
 create mode 100644 Tests/RunCMake/CPack/RPM/PARTIALLY_RELOCATABLE_WARNING-ExpectedFiles.cmake
 rename Tests/RunCMake/{CPackRPM/CPackRPM_PARTIALLY_RELOCATABLE_WARNING-stderr.txt => CPack/RPM/PARTIALLY_RELOCATABLE_WARNING-stderr.txt} (100%)
 create mode 100644 Tests/RunCMake/CPack/RPM/Prerequirements.cmake
 create mode 100644 Tests/RunCMake/CPack/RunCMakeTest.cmake
 create mode 100644 Tests/RunCMake/CPack/VerifyResult.cmake
 delete mode 100644 Tests/RunCMake/CPackRPM/CMakeLists.txt
 delete mode 100644 Tests/RunCMake/CPackRPM/RunCMakeTest.cmake


hooks/post-receive
-- 
CMake