[Cmake-commits] CMake branch, master, updated. v2.8.6-366-gd050d6b

[David Cole]

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  d050d6b58b311a6675286407bf626c0fae6c2eaf (commit)
       via  2d1195123ec85ffd04b415914cc5127db918d2c9 (commit)
       via  1eca18fd522575126b4d1e4faa3c9437d2f12e22 (commit)
       via  bc278ceb0f704ada0cc2cecedc01dd2cb6dc603a (commit)
       via  62e223e8fab50e87a804efd822dc336577608a9d (commit)
       via  40c516783e1df141f3d4a8f6400e90da822395c1 (commit)
       via  c207f5d3616efacdc4d91217f90609fd3679f116 (commit)
       via  9c0df72dc4b4e9403a3516390bc59f971ad1c3de (commit)
       via  174bf35fbbcb22636e538323c168ecbc33a7cb39 (commit)
       via  8507eaed1659d91709c41d34b351ea6a0585983e (commit)
       via  7ada172002e56d3900f4498a2f1bc2ffbc531816 (commit)
       via  3b93e266c0e6f0a58d813fc8ec7bc5810ace4827 (commit)
       via  47457159c70d031cfdb5704ce461644446de5a26 (commit)
       via  bde4edb6ab6501de42bdc167e027a9f5c5760244 (commit)
       via  74ab0f6aa409a9d3e90c91b1b1c7a6e4b865ed62 (commit)
       via  bc7560e6e56d1f6fa65745cf5c1206192fb77b04 (commit)
       via  30fd8e603a52b7230e0b716d8120fc01551c8a4f (commit)
       via  80dfbc99f4b04b5eaea9111fa014f07603a8db16 (commit)
       via  72bb058e92167a272b40b4b710fc2fe41b1fc8fe (commit)
       via  e44ebd5f9b5eed18697dabbc4c1f570f60ded39c (commit)
       via  142317782842751dba4e68f016f3c89c692dc5ac (commit)
       via  f98e6151dc4d1bcc14373e423fcdd668f99ce07a (commit)
       via  69cf480cd65621d3db1390f78ef2d3cd1dddb5d8 (commit)
       via  81c43b4fb6e46430e730e2cb268c283e47995b78 (commit)
       via  72428228970b8b7da54a3c98a36eca6810c46bb5 (commit)
       via  d08bc32bc29078764fc44fd3809eeda527e7017f (commit)
      from  174ecf51f857031b0204a516df809814d4dc0386 (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=d050d6b58b311a6675286407bf626c0fae6c2eaf
commit d050d6b58b311a6675286407bf626c0fae6c2eaf
Merge: 174ecf5 2d11951
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Dec 7 16:47:35 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 7 16:47:35 2011 -0500

    Merge topic 'AutomocIncludedDotMocFileHandling'
    
    2d11951 Merge branch 'master' into AutomocIncludedDotMocFileHandling
    1eca18f automoc: add documentation for CMAKE_AUTOMOC_STRICT_MODE
    bc278ce automoc: fix line length
    62e223e automoc: add variable CMAKE_AUTOMOC_STRICT_MODE, to enable strict parsing
    40c5167 automoc: accept even more .moc files in non-strict mode
    c207f5d automoc: also accept other files when .moc is included in non-strict mode
    9c0df72 automoc: add a StrictParseCppFile(), which is only qmake-compatible
    174bf35 automoc: move the code for finding headers into separate function
    8507eae automoc: fix handling of included _p.moc files
    7ada172 automoc: some more linebreaks for the warnings for better readability
    3b93e26 automoc: add extra check whether the header contains Q_PRIVATE_SLOT
    4745715 Add a test case for the use of Q_PRIVATE_SLOT.
    bde4edb automoc: add special handling for including basename_p.moc, with test
    74ab0f6 automoc: move some code from the big parsing loop into separate functions
    bc7560e automoc: add test for including a moc_abc_p.cpp file
    30fd8e6 automoc: add test for including the moc file from another header
    ...


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

Summary of changes:
 Modules/AutomocInfo.cmake.in     |    1 +
 Source/cmDocumentVariables.cxx   |   14 ++
 Source/cmQtAutomoc.cxx           |  395 +++++++++++++++++++++++++++++++-------
 Source/cmQtAutomoc.h             |   12 +-
 Source/cmTarget.cxx              |    6 +-
 Tests/QtAutomoc/CMakeLists.txt   |    2 +-
 Tests/QtAutomoc/abc.cpp          |   49 +++++
 Tests/QtAutomoc/abc.h            |   28 +++
 Tests/QtAutomoc/abc_p.h          |   30 +++
 Tests/QtAutomoc/bar.cpp          |   28 +++
 Tests/QtAutomoc/blub.cpp         |   40 ++++
 Tests/QtAutomoc/blub.h           |   26 +++
 Tests/QtAutomoc/main.cpp         |   20 ++
 Tests/QtAutomoc/private_slot.cpp |   21 ++
 Tests/QtAutomoc/private_slot.h   |   20 ++
 Tests/QtAutomoc/sub/bar.h        |   28 +++
 Tests/QtAutomoc/xyz.cpp          |   28 +++
 Tests/QtAutomoc/xyz.h            |   28 +++
 Tests/QtAutomoc/yaf.cpp          |   32 +++
 Tests/QtAutomoc/yaf.h            |   25 +++
 Tests/QtAutomoc/yaf_p.h          |   30 +++
 21 files changed, 790 insertions(+), 73 deletions(-)
 create mode 100644 Tests/QtAutomoc/abc.cpp
 create mode 100644 Tests/QtAutomoc/abc.h
 create mode 100644 Tests/QtAutomoc/abc_p.h
 create mode 100644 Tests/QtAutomoc/bar.cpp
 create mode 100644 Tests/QtAutomoc/blub.cpp
 create mode 100644 Tests/QtAutomoc/blub.h
 create mode 100644 Tests/QtAutomoc/private_slot.cpp
 create mode 100644 Tests/QtAutomoc/private_slot.h
 create mode 100644 Tests/QtAutomoc/sub/bar.h
 create mode 100644 Tests/QtAutomoc/xyz.cpp
 create mode 100644 Tests/QtAutomoc/xyz.h
 create mode 100644 Tests/QtAutomoc/yaf.cpp
 create mode 100644 Tests/QtAutomoc/yaf.h
 create mode 100644 Tests/QtAutomoc/yaf_p.h


hooks/post-receive
-- 
CMake