diff options
| author | Brad King <brad.king@kitware.com> | 2017-12-20 13:16:16 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-12-20 13:16:16 (GMT) |
| commit | c69ce01d44fc0dc876aa8d9c4e6e2edd97619a4b (patch) | |
| tree | 83e1352a1a6a7379600d6d20e412e80f27d02dc8 | |
| parent | 307214c0eeb283c24584ba0e14bb2be1ade67ca6 (diff) | |
| parent | 683e9023a70792845544f61daf570c5bfe329ac1 (diff) | |
| download | CMake-c69ce01d44fc0dc876aa8d9c4e6e2edd97619a4b.zip CMake-c69ce01d44fc0dc876aa8d9c4e6e2edd97619a4b.tar.gz CMake-c69ce01d44fc0dc876aa8d9c4e6e2edd97619a4b.tar.bz2 | |
Merge branch 'backport-autogen-nested-lists-fix' into release-3.10
Merge-request: !1606
| -rw-r--r-- | Source/cmQtAutoGen.cxx | 2 | ||||
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmQtAutoGen.cxx b/Source/cmQtAutoGen.cxx index 5e89978..0fc2fc0 100644 --- a/Source/cmQtAutoGen.cxx +++ b/Source/cmQtAutoGen.cxx @@ -248,7 +248,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/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index b329d38..a9c9b9d 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -171,6 +171,9 @@ bool cmQtAutoGenerators::Run(std::string const& targetDirectory, snapshot.GetDirectory().SetCurrentSource(targetDirectory); 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()); bool success = false; |