[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7407-gb503c41

[Stephen Kelly]

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, next has been updated
       via  b503c41c5750abc9dc3216fc9dea07b9e44eb428 (commit)
       via  635e96dde29e7f76e66870dbebfc332360e1ddca (commit)
       via  5414b0e919e0ad182366499835ca65a5192148f8 (commit)
      from  b2c1f33e0938a4748d8b6740b6f8d67543cd62de (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=b503c41c5750abc9dc3216fc9dea07b9e44eb428
commit b503c41c5750abc9dc3216fc9dea07b9e44eb428
Merge: b2c1f33 635e96d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 4 07:44:55 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 4 07:44:55 2014 -0500

    Merge topic 'AUTOMOC-docs' into next
    
    635e96dd Help: Be clearer about which header files are considered for AUTOMOC
    5414b0e9 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=635e96dde29e7f76e66870dbebfc332360e1ddca
commit 635e96dde29e7f76e66870dbebfc332360e1ddca
Author:     Alex Merry <kde at randomguy3.me.uk>
AuthorDate: Tue Feb 4 13:38:47 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 4 13:42:39 2014 +0100

    Help: Be clearer about which header files are considered for AUTOMOC
    
    The old documentation stated that "all header files" were considered,
    which was not true for any sensible definition of "all header files".
    Only header files with certain names are considered.
    
    Document the filename patterns matched for parsing.

diff --git a/Help/prop_tgt/AUTOMOC.rst b/Help/prop_tgt/AUTOMOC.rst
index 16094c7..5e07063 100644
--- a/Help/prop_tgt/AUTOMOC.rst
+++ b/Help/prop_tgt/AUTOMOC.rst
@@ -12,8 +12,11 @@ statement like ``#include "moc_foo.cpp"`` is found, the ``Q_OBJECT`` class
 declaration is expected in the header, and ``moc`` is run on the header
 file.  If an ``#include`` statement like ``#include "foo.moc"`` is found, then
 a ``Q_OBJECT`` is expected in the current source file and ``moc`` is run on
-the file itself.  Additionally, all header files are parsed for
-``Q_OBJECT`` macros, and if found, ``moc`` is also executed on those files.
+the file itself.  Additionally, header files with the same base name (like
+``foo.h``) or ``_p`` appended to the base name (like ``foo_p.h``) are parsed
+for ``Q_OBJECT`` macros, and if found, ``moc`` is also executed on those files.
+``AUTOMOC`` checks multiple header alternative extensions, such as
+``hpp``, ``hxx`` etc when searching for headers.
 The resulting moc files, which are not included as shown above in any
 of the source files are included in a generated
 ``<targetname>_automoc.cpp`` file, which is compiled as part of the

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

Summary of changes:
 Help/prop_tgt/AUTOMOC.rst |    7 +++++--
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake