[Cmake-commits] CMake branch, master, updated. v2.8.11.2-506-g9c119b8

[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  9c119b829dc0189c1ba5c4ae928b671340c7a085 (commit)
       via  cb7f32f5b861fe115fa71f64500a5cbb0b643f1b (commit)
      from  3573a94d729bb15d2a7c212a29ddbe012acd412b (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=9c119b829dc0189c1ba5c4ae928b671340c7a085
commit 9c119b829dc0189c1ba5c4ae928b671340c7a085
Merge: 3573a94 cb7f32f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 16 13:59:22 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 16 13:59:22 2013 -0400

    Merge topic 'obsolete-qt4-macros'
    
    cb7f32f Mark qt4_use_modules and qt4_automoc as obsolete.


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

Summary of changes:
 Modules/FindQt4.cmake                              |    2 +
 Modules/Qt4Macros.cmake                            |   22 ++++++++++++++++++++
 Tests/RunCMake/CMakeLists.txt                      |    4 +++
 .../AutomocMacro-WARN-result.txt}                  |    0
 .../ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt  |    5 ++++
 .../ObsoleteQtMacros/AutomocMacro-WARN.cmake       |    7 ++++++
 .../{CMP0022 => ObsoleteQtMacros}/CMakeLists.txt   |    2 +-
 Tests/RunCMake/ObsoleteQtMacros/RunCMakeTest.cmake |    6 +++++
 .../UseModulesMacro-WARN-result.txt}               |    0
 .../UseModulesMacro-WARN-stderr.txt                |    6 +++++
 .../ObsoleteQtMacros/UseModulesMacro-WARN.cmake    |    7 ++++++
 .../ObsoleteQtMacros}/empty.cpp                    |    0
 12 files changed, 60 insertions(+), 1 deletions(-)
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-static-result.txt => ObsoleteQtMacros/AutomocMacro-WARN-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN-stderr.txt
 create mode 100644 Tests/RunCMake/ObsoleteQtMacros/AutomocMacro-WARN.cmake
 copy Tests/RunCMake/{CMP0022 => ObsoleteQtMacros}/CMakeLists.txt (69%)
 create mode 100644 Tests/RunCMake/ObsoleteQtMacros/RunCMakeTest.cmake
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-static-result.txt => ObsoleteQtMacros/UseModulesMacro-WARN-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN-stderr.txt
 create mode 100644 Tests/RunCMake/ObsoleteQtMacros/UseModulesMacro-WARN.cmake
 copy Tests/{IncludeDirectories/TargetIncludeDirectories => RunCMake/ObsoleteQtMacros}/empty.cpp (100%)


hooks/post-receive
-- 
CMake