summaryrefslogtreecommitdiffstats
path: root/Help/release
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-02-22 15:15:48 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2017-02-22 15:15:48 (GMT)
commitdfebdd6218d8f146277d75597fccde74b45cdbd2 (patch)
treec3bcc1137fd22e21f67e76227a6dd59042d5ace2 /Help/release
parentdc32ad198819a1f25487daa1787f08825bbafef8 (diff)
parent29d96633a405c2848a70ce5931973be2d518b56f (diff)
downloadCMake-dfebdd6218d8f146277d75597fccde74b45cdbd2.zip
CMake-dfebdd6218d8f146277d75597fccde74b45cdbd2.tar.gz
CMake-dfebdd6218d8f146277d75597fccde74b45cdbd2.tar.bz2
Merge topic 'autogen_json'
29d96633 Autogen: Don't use .moc include in Q_PLUGIN_METADATA test d60f1ddc Autogen: Documentation update cdb72127 Autogen: Add release notes for Q_PLUGIN_METADATA support 8b13a52c Autogen: Tests: Set different compression levels in rcc test 9d1db7d7 Autogen: Overhaul and simplify AutogenInfo.cmake file generation 0ab817fa Autogen: Optimize GetCompileDefinitionsAndDirectories function 754d4318 Autogen: Sort AutogenInfo.cmake.in cd74daf0 Autogen: Tests: Add Q_PLUGIN_METADATA test 39c4819e Autogen: Tests: Add moc include tests 50805693 Autogen: Tests: Clean comments c23206b6 Autogen: Log simplifications 347572cf Autogen: Only touch an unchanged moc_compilation.cpp 03df033b Autogen: Rebuild moc when Q_PLUGIN_METADATA json file changes 3ec230de Autogen: Use GetRealPath in central places only 41fb64e7 Autogen: Search moc includes in include directories 175c8900 Autogen: Sort includes before composing include options ...
Diffstat (limited to 'Help/release')
-rw-r--r--Help/release/dev/Autogen_json.rst10
1 files changed, 10 insertions, 0 deletions
diff --git a/Help/release/dev/Autogen_json.rst b/Help/release/dev/Autogen_json.rst
new file mode 100644
index 0000000..73bbdf1
--- /dev/null
+++ b/Help/release/dev/Autogen_json.rst
@@ -0,0 +1,10 @@
+AutoGen json
+------------
+
+* When using :prop_tgt:`AUTOMOC`, CMake scans for the presence of the
+ ``Q_PLUGIN_METADATA`` macro and reruns moc when the file from the
+ macro's ``FILE`` argument changes.
+
+* When :prop_tgt:`AUTOMOC` detects an include statement of the form
+ ``#include "moc_<basename>.cpp"`` the respective header file is searched
+ for in the :prop_tgt:`INCLUDE_DIRECTORIES` of the target as well.