[Cmake-commits] CMake branch, master, updated. v3.3.0-rc2-247-gbddfe77

[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  bddfe77d12ee7d6ecaa3c4fa8ade1c4c0cab5760 (commit)
       via  2bf22a4b908592e363fc9aa93b3d09fbb5387b4d (commit)
       via  0e346427a254024b8eafe52956e8f4ba05d856ed (commit)
      from  6ccb534df3a131d87ea14082fea05484039fc524 (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=bddfe77d12ee7d6ecaa3c4fa8ade1c4c0cab5760
commit bddfe77d12ee7d6ecaa3c4fa8ade1c4c0cab5760
Merge: 6ccb534 2bf22a4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 23 09:08:15 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 23 09:08:15 2015 -0400

    Merge topic 'qt-autogen-always-run'
    
    2bf22a4b QtAutogen: Add comment explaining why rcc cannot use PRE_BUILD
    0e346427 QtAutogen: Always run autogen step even when rcc is enabled (#15608)


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

Summary of changes:
 Source/cmQtAutoGenerators.cxx                      |   25 +++---------------
 Tests/QtAutogen/CMakeLists.txt                     |   23 +++++++++++++++++
 Tests/QtAutogen/automoc_rerun/CMakeLists.txt       |   27 ++++++++++++++++++++
 .../res1/input.txt.in => automoc_rerun/input.txt}  |    0
 .../res1.qrc.in => automoc_rerun/res1.qrc}         |    2 +-
 .../automoc_rerun/test1.cpp}                       |    2 +-
 Tests/QtAutogen/automoc_rerun/test1.h.in1          |    8 ++++++
 Tests/QtAutogen/automoc_rerun/test1.h.in2          |    7 +++++
 8 files changed, 71 insertions(+), 23 deletions(-)
 create mode 100644 Tests/QtAutogen/automoc_rerun/CMakeLists.txt
 copy Tests/QtAutogen/{autorcc_depends/res1/input.txt.in => automoc_rerun/input.txt} (100%)
 copy Tests/QtAutogen/{autorcc_depends/res1.qrc.in => automoc_rerun/res1.qrc} (61%)
 copy Tests/{CTestTestDepends/simple.cxx => QtAutogen/automoc_rerun/test1.cpp} (58%)
 create mode 100644 Tests/QtAutogen/automoc_rerun/test1.h.in1
 create mode 100644 Tests/QtAutogen/automoc_rerun/test1.h.in2


hooks/post-receive
-- 
CMake