diff options
| author | Alex Neundorf <neundorf@kde.org> | 2011-11-01 18:54:04 (GMT) |
|---|---|---|
| committer | Alex Neundorf <neundorf@kde.org> | 2011-11-01 18:54:04 (GMT) |
| commit | 2c648ab7e204540a8a669b597cc7d3510c84647e (patch) | |
| tree | f003aba0fa3ae5f811dc57fafc8928a4c9871cce | |
| parent | 52719a1d66db0bbdb17019bcb2ea5ab0a1258e22 (diff) | |
| download | CMake-2c648ab7e204540a8a669b597cc7d3510c84647e.zip CMake-2c648ab7e204540a8a669b597cc7d3510c84647e.tar.gz CMake-2c648ab7e204540a8a669b597cc7d3510c84647e.tar.bz2 | |
add documentation for the AUTOMOC_MOC_OPTIONS property
Alex
| -rw-r--r-- | Source/cmDocumentVariables.cxx | 9 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 15 |
2 files changed, 23 insertions, 1 deletions
diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx index f4d4e7c..a759a82 100644 --- a/Source/cmDocumentVariables.cxx +++ b/Source/cmDocumentVariables.cxx @@ -1103,6 +1103,15 @@ void cmDocumentVariables::DefineVariables(cmake* cm) "Variables that Control the Build"); cm->DefineProperty + ("CMAKE_AUTOMOC_MOC_OPTIONS", cmProperty::VARIABLE, + "Additional options for moc when using automoc (see CMAKE_AUTOMOC).", + "This variable is used to initialize the " + "AUTOMOC_MOC_OPTIONS property on all the targets. " + "See that target property for additional information.", + false, + "Variables that Control the Build"); + + cm->DefineProperty ("CMAKE_DEBUG_POSTFIX", cmProperty::VARIABLE, "See variable CMAKE_<CONFIG>_POSTFIX.", "This variable is a special case of the more-general " diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index e8064d0..d669a5b 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -157,7 +157,20 @@ 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" + "Additional command line options for moc can be set via the " + "AUTOMOC_MOC_OPTIONS property." + ); + + cm->DefineProperty + ("AUTOMOC_MOC_OPTIONS", cmProperty::TARGET, + "Additional options for moc when using automoc (see the AUTOMOC property)", + "This property is only used if the AUTOMOC property is set to TRUE for " + "this target. In this case, it holds additional command line options " + "which will be used when moc is executed during the build, i.e. it is " + "equivalent to the optional OPTIONS argument of the qt4_wrap_cpp() " + "macro.\n" + "By default it is empty."); cm->DefineProperty ("BUILD_WITH_INSTALL_RPATH", cmProperty::TARGET, |