diff options
| author | David Cole <david.cole@kitware.com> | 2011-11-08 19:42:51 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-11-08 19:42:51 (GMT) |
| commit | 3452dadf89db0bc6cfc6e80d2caf0b6c7891d120 (patch) | |
| tree | b2138c63218c75ae9917c7f511a3b14c007249ab /Source/cmQtAutomoc.h | |
| parent | 6c2f30822bc4eec4bd3e47d0f06fbf9627a21d45 (diff) | |
| parent | 2c648ab7e204540a8a669b597cc7d3510c84647e (diff) | |
| download | CMake-3452dadf89db0bc6cfc6e80d2caf0b6c7891d120.zip CMake-3452dadf89db0bc6cfc6e80d2caf0b6c7891d120.tar.gz CMake-3452dadf89db0bc6cfc6e80d2caf0b6c7891d120.tar.bz2 | |
Merge topic 'AddMocOptionsToAutomoc'
2c648ab add documentation for the AUTOMOC_MOC_OPTIONS property
52719a1 automoc: fix #12541, support moc options
Diffstat (limited to 'Source/cmQtAutomoc.h')
| -rw-r--r-- | Source/cmQtAutomoc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmQtAutomoc.h b/Source/cmQtAutomoc.h index c3550a4..db53b21 100644 --- a/Source/cmQtAutomoc.h +++ b/Source/cmQtAutomoc.h @@ -62,6 +62,7 @@ private: std::string MocCompileDefinitionsStr; std::string MocDefinitionsStr; std::string MocIncludesStr; + std::string MocOptionsStr; std::string ProjectBinaryDir; std::string ProjectSourceDir; std::string TargetName; @@ -71,6 +72,7 @@ private: std::string OutMocCppFilename; std::list<std::string> MocIncludes; std::list<std::string> MocDefinitions; + std::vector<std::string> MocOptions; bool Verbose; bool ColorOutput; |