diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-31 15:48:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-11-01 12:06:42 (GMT) |
| commit | c693db0f62f1a8246458140418398bf76c02e7c4 (patch) | |
| tree | 591789ce03a04d60ad1dbcb09c85495895e8e2be | |
| parent | ddeabf05d80db0758708ec502a68def11b4f9591 (diff) | |
| parent | 978c98b7bda6286d153c7b942509a92b66cb8fbc (diff) | |
| download | CMake-c693db0f62f1a8246458140418398bf76c02e7c4.zip CMake-c693db0f62f1a8246458140418398bf76c02e7c4.tar.gz CMake-c693db0f62f1a8246458140418398bf76c02e7c4.tar.bz2 | |
Merge branch 'backport-3.9-autogen-moc-predefs-no-moc-options' into release-3.9
Merge-request: !1432
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index d12d96d..c3ecb51 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -1268,9 +1268,6 @@ bool cmQtAutoGenerators::MocGenerateAll( it != this->MocDefinitions.end(); ++it) { cmd.push_back("-D" + (*it)); } - // Add options - cmd.insert(cmd.end(), this->MocOptions.begin(), - this->MocOptions.end()); // Execute command if (!this->RunCommand(cmd, output, false)) { { |