diff options
| author | Brad King <brad.king@kitware.com> | 2017-11-01 12:05:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-11-01 12:05:47 (GMT) |
| commit | 77e758a3edab6836151d5b1e690096c4f33dbd23 (patch) | |
| tree | fd5e01e6b0f68510a449d33ccc30340f3e08cd09 | |
| parent | cdc9c110a5bbe82d761f1a6d58b202a41b245de6 (diff) | |
| parent | 4e46f97c84431e860aab3da78495b6c0e8c37725 (diff) | |
| download | CMake-77e758a3edab6836151d5b1e690096c4f33dbd23.zip CMake-77e758a3edab6836151d5b1e690096c4f33dbd23.tar.gz CMake-77e758a3edab6836151d5b1e690096c4f33dbd23.tar.bz2 | |
Merge topic 'autogen-moc-predefs-no-moc-options'
4e46f97c Merge branch 'backport-3.9' into autogen-moc-predefs-no-moc-options
978c98b7 Autogen: Don't add AUTOMOC_MOC_OPTIONS to moc-predefs command
d3caf941 Autogen: Tests: Set AUTOMOC_MOC_OPTIONS in a simple test
96d20a4d Autogen: Don't use AUTOMOC_MOC_OPTIONS in moc-predefs command
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: EoD <eod@xmw.de>
Merge-request: !1432
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 10 | ||||
| -rw-r--r-- | Tests/QtAutogen/CMakeLists.txt | 5 |
2 files changed, 12 insertions, 3 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 87c0f89..b329d38 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -1392,9 +1392,13 @@ bool cmQtAutoGenerators::MocGenerateAll() { // Compose command std::vector<std::string> cmd = this->MocPredefsCmd; - // Add options - cmd.insert(cmd.end(), this->MocAllOptions.begin(), - this->MocAllOptions.end()); + // Add includes + cmd.insert(cmd.end(), this->MocIncludes.begin(), + this->MocIncludes.end()); + // Add definitions + for (std::string const& def : this->MocDefinitions) { + cmd.push_back("-D" + def); + } // Execute command if (!this->RunCommand(cmd, output)) { this->LogCommandError(cmQtAutoGen::MOC, diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt index b9d8e46..32c2950 100644 --- a/Tests/QtAutogen/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -65,6 +65,11 @@ add_executable(mocOnly mocOnlySource/main.cpp mocOnlySource/StyleA.cpp mocOnlySo set_property(TARGET mocOnly PROPERTY AUTOMOC ON) target_link_libraries(mocOnly ${QT_LIBRARIES}) +add_executable(mocOnlyOpts mocOnlySource/main.cpp mocOnlySource/StyleA.cpp mocOnlySource/StyleB.cpp) +set_property(TARGET mocOnlyOpts PROPERTY AUTOMOC ON) +set_property(TARGET mocOnlyOpts PROPERTY AUTOMOC_MOC_OPTIONS "-nw") +target_link_libraries(mocOnlyOpts ${QT_LIBRARIES}) + # -- Test # UIC only if(ALLOW_WRAP_CPP) |