diff options
| author | David Cole <david.cole@kitware.com> | 2011-12-07 21:47:35 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-12-07 21:47:35 (GMT) |
| commit | d050d6b58b311a6675286407bf626c0fae6c2eaf (patch) | |
| tree | e35a3b451c8113c458dc2bb64a4293e37b812c9b /Source/cmTarget.cxx | |
| parent | 174ecf51f857031b0204a516df809814d4dc0386 (diff) | |
| parent | 2d1195123ec85ffd04b415914cc5127db918d2c9 (diff) | |
| download | CMake-d050d6b58b311a6675286407bf626c0fae6c2eaf.zip CMake-d050d6b58b311a6675286407bf626c0fae6c2eaf.tar.gz CMake-d050d6b58b311a6675286407bf626c0fae6c2eaf.tar.bz2 | |
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
...
Diffstat (limited to 'Source/cmTarget.cxx')
| -rw-r--r-- | Source/cmTarget.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index d3715b8..fc3c1c9 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -161,8 +161,10 @@ void cmTarget::DefineProperties(cmake *cm) "This property is initialized by the value of the variable " "CMAKE_AUTOMOC if it is set when a target is created.\n" "Additional command line options for moc can be set via the " - "AUTOMOC_MOC_OPTIONS property." - ); + "AUTOMOC_MOC_OPTIONS property.\n" + "By setting the CMAKE_AUTOMOC_STRICT_MODE variable to FALSE the rules " + "for searching the files which will be processed by moc can be relaxed. " + "See the documentation for this variable for more details."); cm->DefineProperty ("AUTOMOC_MOC_OPTIONS", cmProperty::TARGET, |