[Cmake-commits] CMake branch, master, updated. v3.0.2-2128-ga2456e1

[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  a2456e157223255f0e2a71f2ddd510510e42b9e4 (commit)
       via  6e1c359fe9bee71c421a671108176d47fb415d93 (commit)
       via  a29953180c21ba0d56fb236eb58bafd40ae68961 (commit)
       via  506151af519aa50594000d22c66c0620f026878f (commit)
      from  0f068c177c3834aacc1b27e32c318b53adad06f9 (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=a2456e157223255f0e2a71f2ddd510510e42b9e4
commit a2456e157223255f0e2a71f2ddd510510e42b9e4
Merge: 0f068c1 6e1c359
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 27 11:29:17 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 27 11:29:17 2014 -0400

    Merge topic 'autorcc-depends'
    
    6e1c359f QtAutogen: Regenerate qrc files if their input changes (#15074)
    a2995318 QtAutogen: Expand rccfiles into a vector early in the autogen process.
    506151af QtAutogen: Extract a GetRccExecutable method.


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

Summary of changes:
 Modules/AutogenInfo.cmake.in                       |    1 +
 Source/cmQtAutoGenerators.cxx                      |  327 ++++++++++++++++++--
 Source/cmQtAutoGenerators.h                        |   14 +-
 Tests/QtAutogen/CMakeLists.txt                     |   32 ++
 Tests/QtAutogen/autorcc_depends/CMakeLists.txt     |   24 ++
 Tests/QtAutogen/autorcc_depends/res1.qrc           |    5 +
 Tests/QtAutogen/autorcc_depends/res1_input.txt     |    1 +
 .../autorcc_depends/test_res1.cpp}                 |    0
 8 files changed, 380 insertions(+), 24 deletions(-)
 create mode 100644 Tests/QtAutogen/autorcc_depends/CMakeLists.txt
 create mode 100644 Tests/QtAutogen/autorcc_depends/res1.qrc
 create mode 100644 Tests/QtAutogen/autorcc_depends/res1_input.txt
 copy Tests/{CTestTestCycle/simple.cxx => QtAutogen/autorcc_depends/test_res1.cpp} (100%)


hooks/post-receive
-- 
CMake