reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-12-12 22:05:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge topic 'autogen-nested-lists-fix'

Browse Source 
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
This commit is contained in:
Brad King 2017-12-20 13:17:35 +00:00 committed by Kitware Robot
commit bad72ccb7f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmQtAutoGen.cxx
View File

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

3
Source/cmQtAutoGenerator.cxx
View File

@ -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());