[Cmake-commits] CMake branch, master, updated. v2.8.10.2-866-g26bfece

[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  26bfece1af0e3b06778e56eddd9cdd1f448a5c77 (commit)
       via  a223a3b65f518f59a73967f0087b0d67842d9f0d (commit)
       via  65b5c1e0645a466dbf5d163296754d12e2db53d5 (commit)
      from  9a02a267021b4bced796ac73e1a69fd095883d15 (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=26bfece1af0e3b06778e56eddd9cdd1f448a5c77
commit 26bfece1af0e3b06778e56eddd9cdd1f448a5c77
Merge: 9a02a26 a223a3b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 13 13:34:24 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 13 13:34:24 2013 -0400

    Merge topic 'fix-automoc-no-qt'
    
    a223a3b Automoc: Don't create automoc targets if Qt is not used (#13999)
    65b5c1e Merge branch 'property-link-depends-no-crash' into fix-automoc-no-qt


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

Summary of changes:
 Source/cmGlobalGenerator.cxx                       |    6 +++-
 Source/cmQtAutomoc.cxx                             |   26 ++++++++++---------
 Source/cmQtAutomoc.h                               |    2 +-
 Tests/CMakeLists.txt                               |   10 +++++++
 Tests/QtAutomocNoQt/CMakeLists.txt                 |    7 +++++
 .../subdir => QtAutomocNoQt}/main.c                |    0
 6 files changed, 36 insertions(+), 15 deletions(-)
 create mode 100644 Tests/QtAutomocNoQt/CMakeLists.txt
 copy Tests/{CTestTestSubdir/subdir => QtAutomocNoQt}/main.c (100%)


hooks/post-receive
-- 
CMake