[Cmake-commits] CMake branch, master, updated. v3.6.0-470-g19ccd35

[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  19ccd354730a6f9eeb70fa586c9b8bc4d32b3a07 (commit)
       via  5e55d87bdc4d14507fec2bae7a41f3fb9498db1a (commit)
      from  e09518ca50177d1dd0e1e156f481cd51562a394b (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19ccd354730a6f9eeb70fa586c9b8bc4d32b3a07
commit 19ccd354730a6f9eeb70fa586c9b8bc4d32b3a07
Merge: e09518c 5e55d87
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 22 09:17:28 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 22 09:17:28 2016 -0400

    Merge topic 'revert-autogen-subdirs'
    
    5e55d87b Autogen: Revert changes to generate moc/rcc in subdirectories


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

Summary of changes:
 Source/cmQtAutoGeneratorInitializer.cxx    |  120 +++++++---------------------
 Source/cmQtAutoGenerators.cxx              |   79 ++++--------------
 Source/cmQtAutoGenerators.h                |    5 +-
 Tests/QtAutogen/CMakeLists.txt             |    4 -
 Tests/QtAutogen/same_name/CMakeLists.txt   |   20 -----
 Tests/QtAutogen/same_name/aaa/bbb/data.qrc |    6 --
 Tests/QtAutogen/same_name/aaa/bbb/item.cpp |   10 ---
 Tests/QtAutogen/same_name/aaa/bbb/item.hpp |   18 -----
 Tests/QtAutogen/same_name/aaa/data.qrc     |    6 --
 Tests/QtAutogen/same_name/aaa/item.cpp     |    8 --
 Tests/QtAutogen/same_name/aaa/item.hpp     |   16 ----
 Tests/QtAutogen/same_name/bbb/aaa/data.qrc |    6 --
 Tests/QtAutogen/same_name/bbb/aaa/item.cpp |   10 ---
 Tests/QtAutogen/same_name/bbb/aaa/item.hpp |   18 -----
 Tests/QtAutogen/same_name/bbb/data.qrc     |    6 --
 Tests/QtAutogen/same_name/bbb/item.cpp     |    8 --
 Tests/QtAutogen/same_name/bbb/item.hpp     |   16 ----
 Tests/QtAutogen/same_name/ccc/data.qrc     |    6 --
 Tests/QtAutogen/same_name/ccc/item.cpp     |   23 ------
 Tests/QtAutogen/same_name/ccc/item.hpp     |   16 ----
 Tests/QtAutogen/same_name/data.qrc         |    5 --
 Tests/QtAutogen/same_name/main.cpp         |   16 ----
 22 files changed, 45 insertions(+), 377 deletions(-)
 delete mode 100644 Tests/QtAutogen/same_name/CMakeLists.txt
 delete mode 100644 Tests/QtAutogen/same_name/aaa/bbb/data.qrc
 delete mode 100644 Tests/QtAutogen/same_name/aaa/bbb/item.cpp
 delete mode 100644 Tests/QtAutogen/same_name/aaa/bbb/item.hpp
 delete mode 100644 Tests/QtAutogen/same_name/aaa/data.qrc
 delete mode 100644 Tests/QtAutogen/same_name/aaa/item.cpp
 delete mode 100644 Tests/QtAutogen/same_name/aaa/item.hpp
 delete mode 100644 Tests/QtAutogen/same_name/bbb/aaa/data.qrc
 delete mode 100644 Tests/QtAutogen/same_name/bbb/aaa/item.cpp
 delete mode 100644 Tests/QtAutogen/same_name/bbb/aaa/item.hpp
 delete mode 100644 Tests/QtAutogen/same_name/bbb/data.qrc
 delete mode 100644 Tests/QtAutogen/same_name/bbb/item.cpp
 delete mode 100644 Tests/QtAutogen/same_name/bbb/item.hpp
 delete mode 100644 Tests/QtAutogen/same_name/ccc/data.qrc
 delete mode 100644 Tests/QtAutogen/same_name/ccc/item.cpp
 delete mode 100644 Tests/QtAutogen/same_name/ccc/item.hpp
 delete mode 100644 Tests/QtAutogen/same_name/data.qrc
 delete mode 100644 Tests/QtAutogen/same_name/main.cpp


hooks/post-receive
-- 
CMake