[Cmake-commits] CMake branch, master, updated. v3.10.1-662-g4d6c273

[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  4d6c27360636ecaa9f815306fecb3b5fbcce68bc (commit)
       via  bad72ccb7f5276ae0fa387fbd94cc102a34c1877 (commit)
       via  c69ce01d44fc0dc876aa8d9c4e6e2edd97619a4b (commit)
       via  493ad0565e5cecf32da6dcefd8dec78ae10eab0f (commit)
       via  683e9023a70792845544f61daf570c5bfe329ac1 (commit)
       via  3ce7eecedc2686520af930fb86cf5c7a79fd4fb1 (commit)
      from  740e598c8ef708656175709a2b51476604005863 (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=4d6c27360636ecaa9f815306fecb3b5fbcce68bc
commit 4d6c27360636ecaa9f815306fecb3b5fbcce68bc
Merge: bad72cc c69ce01
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 20 08:18:35 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 20 08:18:35 2017 -0500

    Merge branch 'release-3.10'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bad72ccb7f5276ae0fa387fbd94cc102a34c1877
commit bad72ccb7f5276ae0fa387fbd94cc102a34c1877
Merge: 740e598 493ad05
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 20 13:17:35 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Dec 20 08:17:37 2017 -0500

    Merge topic 'autogen-nested-lists-fix'
    
    493ad056 Merge branch 'backport-autogen-nested-lists-fix' into autogen-nested-lists-fix
    683e9023 Autogen: Fix for problematic nested list separator
    3ce7eece Autogen: Fix for problematic nested lists separator
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1607


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=493ad0565e5cecf32da6dcefd8dec78ae10eab0f
commit 493ad0565e5cecf32da6dcefd8dec78ae10eab0f
Merge: 3ce7eec 683e902
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 20 08:15:22 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 20 08:15:22 2017 -0500

    Merge branch 'backport-autogen-nested-lists-fix' into autogen-nested-lists-fix


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ce7eecedc2686520af930fb86cf5c7a79fd4fb1
commit 3ce7eecedc2686520af930fb86cf5c7a79fd4fb1
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Mon Dec 18 14:36:17 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Mon Dec 18 14:36:17 2017 +0100

    Autogen: Fix for problematic nested lists separator
    
    In the AutogenInfo.cmake file the separator for nested lists
    was `@LSEP@` which led to a speed regression because the `@`
    character triggered an (unsuccessful) expression evaluation.
    
    By setting the policy version of the CMake instance in the
    `_autogen` target to 3.9, the OLD `@` evaluating behavior
    controlled by policy CMP0053 is disabled.
    
    Also the nested lists separator string is changed to `<<<S>>>`,
    which solves the problem twofold.
    
    Closes #17570

diff --git a/Source/cmQtAutoGen.cxx b/Source/cmQtAutoGen.cxx
index b9dd392..255a532 100644
--- a/Source/cmQtAutoGen.cxx
+++ b/Source/cmQtAutoGen.cxx
@@ -233,7 +233,7 @@ static bool RccListInputsQt5(std::string const& rccCommand,
 
 // - Class definitions
 
-std::string const cmQtAutoGen::listSep = "@LSEP@";
+std::string const cmQtAutoGen::listSep = "<<<S>>>";
 
 std::string const& cmQtAutoGen::GeneratorName(Generator type)
 {
diff --git a/Source/cmQtAutoGenerator.cxx b/Source/cmQtAutoGenerator.cxx
index 52193af..ee0ddbc 100644
--- a/Source/cmQtAutoGenerator.cxx
+++ b/Source/cmQtAutoGenerator.cxx
@@ -78,6 +78,9 @@ bool cmQtAutoGenerator::Run(std::string const& infoFile,
   snapshot.GetDirectory().SetCurrentSource(this->InfoDir);
 
   auto makefile = cm::make_unique<cmMakefile>(&gg, snapshot);
+  // The OLD/WARN behavior for policy CMP0053 caused a speed regression.
+  // https://gitlab.kitware.com/cmake/cmake/issues/17570
+  makefile->SetPolicyVersion("3.9");
   gg.SetCurrentMakefile(makefile.get());
 
   return this->Process(makefile.get());

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

Summary of changes:
 Source/cmQtAutoGen.cxx       |    2 +-
 Source/cmQtAutoGenerator.cxx |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake