diff options
| author | Brad King <brad.king@kitware.com> | 2017-12-20 13:17:35 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-12-20 13:17:37 (GMT) |
| commit | bad72ccb7f5276ae0fa387fbd94cc102a34c1877 (patch) | |
| tree | 519494b9ccf3de63aeed19721b31b35ee52ab3bb | |
| parent | 740e598c8ef708656175709a2b51476604005863 (diff) | |
| parent | 493ad0565e5cecf32da6dcefd8dec78ae10eab0f (diff) | |
| download | CMake-bad72ccb7f5276ae0fa387fbd94cc102a34c1877.zip CMake-bad72ccb7f5276ae0fa387fbd94cc102a34c1877.tar.gz CMake-bad72ccb7f5276ae0fa387fbd94cc102a34c1877.tar.bz2 | |
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@kitware.com>
Merge-request: !1607
| -rw-r--r-- | Source/cmQtAutoGen.cxx | 2 | ||||
| -rw-r--r-- | Source/cmQtAutoGenerator.cxx | 3 |
2 files changed, 4 insertions, 1 deletions
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()); |