[Cmake-commits] CMake branch, master, updated. v3.10.0-rc3-228-ga57bad6

[Kitware Robot]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  a57bad6c3d0dbc885bb71dfe465d09a380c35960 (commit)
       via  1c222d85447d6f237c39d7fc3d4d970ea4fa44f1 (commit)
       via  c693db0f62f1a8246458140418398bf76c02e7c4 (commit)
       via  77e758a3edab6836151d5b1e690096c4f33dbd23 (commit)
       via  4e46f97c84431e860aab3da78495b6c0e8c37725 (commit)
       via  8d1341f4ff8b8e61fc1b162c90cf5170ec57ac6f (commit)
       via  978c98b7bda6286d153c7b942509a92b66cb8fbc (commit)
       via  1df31aa92a398e0ef02e1ccccd41969a63bad29e (commit)
       via  d3caf941e4940bb133088bea4c790a90e749f8b8 (commit)
       via  96d20a4de3420fca0e25a67c24e6f7eaead4420d (commit)
      from  cdc9c110a5bbe82d761f1a6d58b202a41b245de6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a57bad6c3d0dbc885bb71dfe465d09a380c35960
commit a57bad6c3d0dbc885bb71dfe465d09a380c35960
Merge: 1c222d8 8d1341f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 1 08:07:25 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 1 08:07:25 2017 -0400

    Merge branch 'release-3.10'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c222d85447d6f237c39d7fc3d4d970ea4fa44f1
commit 1c222d85447d6f237c39d7fc3d4d970ea4fa44f1
Merge: 77e758a c693db0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 1 08:07:18 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 1 08:07:18 2017 -0400

    Merge branch 'release-3.9'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c693db0f62f1a8246458140418398bf76c02e7c4
commit c693db0f62f1a8246458140418398bf76c02e7c4
Merge: ddeabf0 978c98b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 31 11:48:02 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 1 08:06:42 2017 -0400

    Merge branch 'backport-3.9-autogen-moc-predefs-no-moc-options' into release-3.9
    
    Merge-request: !1432


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77e758a3edab6836151d5b1e690096c4f33dbd23
commit 77e758a3edab6836151d5b1e690096c4f33dbd23
Merge: cdc9c11 4e46f97
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 1 12:05:43 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Nov 1 08:05:47 2017 -0400

    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 at kitware.com>
    Acked-by: EoD <eod at xmw.de>
    Merge-request: !1432


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e46f97c84431e860aab3da78495b6c0e8c37725
commit 4e46f97c84431e860aab3da78495b6c0e8c37725
Merge: d3caf94 978c98b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 1 08:03:55 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 1 08:03:55 2017 -0400

    Merge branch 'backport-3.9' into autogen-moc-predefs-no-moc-options


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=978c98b7bda6286d153c7b942509a92b66cb8fbc
commit 978c98b7bda6286d153c7b942509a92b66cb8fbc
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Tue Oct 31 16:27:38 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 31 11:46:15 2017 -0400

    Autogen: Don't add AUTOMOC_MOC_OPTIONS to moc-predefs command
    
    Issue: #17418

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)) {
           {

-----------------------------------------------------------------------

Summary of changes:
 Source/cmQtAutoGenerators.cxx  |   10 +++++++---
 Tests/QtAutogen/CMakeLists.txt |    5 +++++
 2 files changed, 12 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake