[Cmake-commits] CMake branch, master, updated. v2.8.12.2-1291-gbbc82d8

[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  bbc82d85e5e721cc705f1d836630c672cd4acf28 (commit)
       via  f7ae1d8ad6d0db2b6656ed77f7de12189badf05c (commit)
       via  4b989d5f158e5135bf543438af00b03db0102ade (commit)
       via  c48d877d3116ea4aed581fda42591c3d86d8df40 (commit)
       via  394e86df2a0adeecbdab96b3f28e575150153e11 (commit)
       via  964d7f2ae9360ad38590c7805d7275c478133f36 (commit)
       via  0d934efd597a9370875954af8f0ab16b8e3b80fd (commit)
       via  321e348e133f2f62dd51cd663fe30c7513ea53d8 (commit)
       via  e96683b048e1d710b1bb0791b816638207283ef0 (commit)
       via  e6182f5d5d5b93268b453dc099df6fe7b8cdbb11 (commit)
      from  fed6c73e1d21adee7e82d61ec1e08c0eaa184a39 (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=bbc82d85e5e721cc705f1d836630c672cd4acf28
commit bbc82d85e5e721cc705f1d836630c672cd4acf28
Merge: fed6c73 f7ae1d8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 29 10:05:04 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 29 10:05:04 2014 -0500

    Merge topic 'fix-Qt-autogen'
    
    f7ae1d8a QtAutogen: Short-circut some logic when moc is not available.
    4b989d5f QtAutogen: Separate source file processing from AUTOMOC.
    c48d877d QtAutogen: Make some methods appropriately file-static.
    394e86df QtAutogen: Fix autouic target options in the presence of a config.
    964d7f2a QtAutogen: Remove unused variables.
    0d934efd QtAutogen: Remove read of SKIP_AUTOUIC target property.
    321e348e QtAutogen: Use Qt 4 IMPORTED targets to find executable locations.
    e96683b0 Qt4: Use IMPORTED executable names with custom commands.
    e6182f5d Qt4: Create IMPORTED executable targets for all Qt executables.


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

Summary of changes:
 Modules/AutogenInfo.cmake.in                   |    2 +-
 Modules/FindQt4.cmake                          |   86 ++-----
 Modules/Qt4Macros.cmake                        |   18 +-
 Source/cmQtAutoGenerators.cxx                  |  318 ++++++++++++------------
 Source/cmQtAutoGenerators.h                    |    6 +-
 Tests/Qt4And5Automoc/CMakeLists.txt            |   15 +-
 Tests/Qt4And5Automoc/{main.cpp => main.cpp.in} |    0
 Tests/Qt4And5Automoc/main_qt4.cpp              |    4 -
 Tests/Qt4And5Automoc/main_qt5.cpp              |    4 -
 Tests/QtAutogen/CMakeLists.txt                 |   14 ++
 Tests/QtAutogen/uiconly.cpp                    |   13 +
 Tests/QtAutogen/uiconly.h                      |   20 ++
 Tests/QtAutogen/uiconly.ui                     |   24 ++
 13 files changed, 274 insertions(+), 250 deletions(-)
 rename Tests/Qt4And5Automoc/{main.cpp => main.cpp.in} (100%)
 delete mode 100644 Tests/Qt4And5Automoc/main_qt4.cpp
 delete mode 100644 Tests/Qt4And5Automoc/main_qt5.cpp
 create mode 100644 Tests/QtAutogen/uiconly.cpp
 create mode 100644 Tests/QtAutogen/uiconly.h
 create mode 100644 Tests/QtAutogen/uiconly.ui


hooks/post-receive
-- 
CMake