diff options
| author | Alex Neundorf <neundorf@kde.org> | 2011-12-06 19:42:20 (GMT) |
|---|---|---|
| committer | Alex Neundorf <neundorf@kde.org> | 2011-12-06 19:42:20 (GMT) |
| commit | 1eca18fd522575126b4d1e4faa3c9437d2f12e22 (patch) | |
| tree | 64d45e36ece03aae68e2f91b62c05021355c736d | |
| parent | bc278ceb0f704ada0cc2cecedc01dd2cb6dc603a (diff) | |
| download | CMake-1eca18fd522575126b4d1e4faa3c9437d2f12e22.zip CMake-1eca18fd522575126b4d1e4faa3c9437d2f12e22.tar.gz CMake-1eca18fd522575126b4d1e4faa3c9437d2f12e22.tar.bz2 | |
automoc: add documentation for CMAKE_AUTOMOC_STRICT_MODE
Alex
| -rw-r--r-- | Source/cmDocumentVariables.cxx | 14 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 5 |
2 files changed, 18 insertions, 1 deletions
diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx index f46e1ce..7370ef4 100644 --- a/Source/cmDocumentVariables.cxx +++ b/Source/cmDocumentVariables.cxx @@ -508,6 +508,20 @@ void cmDocumentVariables::DefineVariables(cmake* cm) "Variables That Change Behavior"); cm->DefineProperty + ("CMAKE_AUTOMOC_STRICT_MODE", cmProperty::VARIABLE, + "Switch between strict and relaxed automoc mode.", + "When TRUE, automoc behaves exactly as described in the documentation " + "of the AUTOMOC target property. " + "When set to FALSE, it accepts more input and tries to find the correct " + "input file for moc even if it differs from the documented behaviour. " + "In this mode it e.g. also checks whether a header file is intended to " + "be processed by moc when a \"foo.moc\" file has been included.\n" + "When using Qt4, CMAKE_AUTOMOC_STRICT_MODE is initialized to FALSE. " + "It also has to be set to FALSE for KDE4 compatibility.", + false, + "Variables That Change Behavior"); + + cm->DefineProperty ("CMAKE_FIND_LIBRARY_PREFIXES", cmProperty::VARIABLE, "Prefixes to prepend when looking for libraries.", "This specifies what prefixes to add to library names when " diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index f7d3ba9..279f626 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -157,7 +157,10 @@ void cmTarget::DefineProperties(cmake *cm) "files are included in a generated <targetname>_automoc.cpp file, " "which is compiled as part of the target." "This property is initialized by the value of the variable " - "CMAKE_AUTOMOC if it is set when a target is created."); + "CMAKE_AUTOMOC if it is set when a target is created.\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 ("BUILD_WITH_INSTALL_RPATH", cmProperty::TARGET, |