summaryrefslogtreecommitdiffstats
path: root/Help/release/dev/autogen-macro-names.rst
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-09-29 12:52:43 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-09-29 12:53:13 (GMT)
commit194dd9ea8b6fb8b73aa6484551e87bb7676015cc (patch)
tree56fae753a54c2f8faedf8d87d4c48bcbef244a13 /Help/release/dev/autogen-macro-names.rst
parent460a94e29f19846bc219f8f8a02cddb196472be9 (diff)
parent93c8d55d049cacaa884d71b6c3177ce3757ab817 (diff)
downloadCMake-194dd9ea8b6fb8b73aa6484551e87bb7676015cc.zip
CMake-194dd9ea8b6fb8b73aa6484551e87bb7676015cc.tar.gz
CMake-194dd9ea8b6fb8b73aa6484551e87bb7676015cc.tar.bz2
Merge topic 'autogen-macro-names2'
93c8d55d Autogen: Update (CMAKE_)AUTOMOC_MACRO_NAMES release notes 084ace47 Autogen: Tests: Update AUTOMOC_MACRO_NAMES test 08041dd1 Autogen: Doc: Update documentation for (CMAKE_)AUTOMOC_MACRO_NAMES 7b33d67b Autogen: Create info file directory before writing 786b5be0 Autogen: Define all macro names in CMAKE_AUTOMOC_MACRO_NAMES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1321
Diffstat (limited to 'Help/release/dev/autogen-macro-names.rst')
-rw-r--r--Help/release/dev/autogen-macro-names.rst18
1 files changed, 10 insertions, 8 deletions
diff --git a/Help/release/dev/autogen-macro-names.rst b/Help/release/dev/autogen-macro-names.rst
index 736dd3a..6471295 100644
--- a/Help/release/dev/autogen-macro-names.rst
+++ b/Help/release/dev/autogen-macro-names.rst
@@ -1,12 +1,14 @@
autogen-macro-names
-------------------
-* When using :prop_tgt:`AUTOMOC`, CMake searches for the strings ``Q_OBJECT``
- and ``Q_OBJECT`` in a source file to determine if it needs to be ``moc``
- processed. The new variable :variable:`CMAKE_AUTOMOC_MACRO_NAMES` allows to
- register additional strings (macro names) so search for.
+* When using :prop_tgt:`AUTOMOC`, CMake searches for the strings ``Q_OBJECT``,
+ ``Q_GADGET`` or ``Q_NAMESPACE`` in a source file to determine if it needs
+ to be ``moc`` processed. The new variable
+ :variable:`CMAKE_AUTOMOC_MACRO_NAMES` allows to register additional
+ strings (macro names) so search for.
-* When using :prop_tgt:`AUTOMOC`, CMake searches for the strings ``Q_OBJECT``
- and ``Q_OBJECT`` in a source file to determine if it needs to be ``moc``
- processed. The new target property :prop_tgt:`AUTOMOC_MACRO_NAMES` allows to
- register additional strings (macro names) so search for.
+* When using :prop_tgt:`AUTOMOC`, CMake searches for the strings ``Q_OBJECT``,
+ ``Q_GADGET`` or ``Q_NAMESPACE`` in a source file to determine if it needs
+ to be ``moc`` processed. The new target property
+ :prop_tgt:`AUTOMOC_MACRO_NAMES` allows to register additional strings
+ (macro names) so search for.