[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7094-g2b9a6a1

[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  2b9a6a1731ec7922be4cd2587a7180d09f3462c5 (commit)
       via  4608a260d482c0c07c52eded1dcb7f6c04187e19 (commit)
      from  8376297d0a2f54b788a28059d6d6a2dce9f2565e (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=2b9a6a1731ec7922be4cd2587a7180d09f3462c5
commit 2b9a6a1731ec7922be4cd2587a7180d09f3462c5
Merge: 8376297 4608a26
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jan 14 09:08:59 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 14 09:08:59 2014 -0500

    Merge topic 'doc-Qt-macro-TARGET-arg' into next
    
    4608a260 Document the TARGET options in Qt4 macros.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4608a260d482c0c07c52eded1dcb7f6c04187e19
commit 4608a260d482c0c07c52eded1dcb7f6c04187e19
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jan 14 14:55:05 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jan 14 14:55:05 2014 +0100

    Document the TARGET options in Qt4 macros.
    
    Feature introduced in commit 9ce60ff5 (Qt4Macros: Allow specifying
    a TARGET in invokations of macros., 2013-02-26).

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 46a893d..9be4270 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -107,11 +107,13 @@
 #
 # ::
 #
-#   macro QT4_WRAP_CPP(outfiles inputfile ... OPTIONS ...)
+#   macro QT4_WRAP_CPP(outfiles inputfile ... [TARGET tgt] OPTIONS ...)
 #         create moc code from a list of files containing Qt class with
 #         the Q_OBJECT declaration.  Per-directory preprocessor definitions
-#         are also added.  Options may be given to moc, such as those found
-#         when executing "moc -help".
+#         are also added.  If the <tgt> is specified, the
+#         INTERFACE_INCLUDE_DIRECTORIES and INTERFACE_COMPILE_DEFINITIONS from
+#         the <tgt> are passed to moc.  Options may be given to moc, such as
+#         those found when executing "moc -help".
 #
 #
 #
@@ -135,16 +137,19 @@
 #
 # ::
 #
-#   macro QT4_GENERATE_MOC(inputfile outputfile )
+#   macro QT4_GENERATE_MOC(inputfile outputfile [TARGET tgt])
 #         creates a rule to run moc on infile and create outfile.
 #         Use this if for some reason QT4_WRAP_CPP() isn't appropriate, e.g.
-#         because you need a custom filename for the moc file or something similar.
+#         because you need a custom filename for the moc file or something
+#         similar.  If the <tgt> is specified, the
+#         INTERFACE_INCLUDE_DIRECTORIES and INTERFACE_COMPILE_DEFINITIONS from
+#         the <tgt> are passed to moc.
 #
 #
 #
 # ::
 #
-#   macro QT4_AUTOMOC(sourcefile1 sourcefile2 ... )
+#   macro QT4_AUTOMOC(sourcefile1 sourcefile2 ...  [TARGET tgt])
 #         The qt4_automoc macro is obsolete.  Use the CMAKE_AUTOMOC feature instead.
 #         This macro is still experimental.
 #         It can be used to have moc automatically handled.
@@ -157,7 +162,8 @@
 #         them cause a rule to be generated to run moc at build time on the
 #         accompanying header file foo.h.
 #         If a source file has the SKIP_AUTOMOC property set it will be ignored by this macro.
-#
+#         If the <tgt> is specified, the INTERFACE_INCLUDE_DIRECTORIES and
+#         INTERFACE_COMPILE_DEFINITIONS from the <tgt> are passed to moc.
 #
 #
 # ::

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

Summary of changes:
 Modules/FindQt4.cmake |   20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake