dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-05 23:30:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Autogen: Don't change the order of HEADERS array in AutogenInfo.json

Browse Source 
Qt6 reads our internal AutogenInfo.json file. In 92d7b456e5
(Autogen: Add support for per-config sources, 2020-10-20), the
ordering of the HEADERS array elements was changed and this
broke their cmake_automoc_parser. We don't need to change the
order of the array elements, we can append to the existing ones
instead. Do this to allow their cmake_automoc_parser to continue
to work.

Fixes: #21823
This commit is contained in:
Craig Scott
2021-02-22 16:11:26 +11:00
parent 48410610a6
commit a3df25c694
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmQtAutoGenInitializer.cxx
View File

@@ -1568,8 +1568,8 @@ bool cmQtAutoGenInitializer::SetupWriteAutogenInfo()
jval[0u] = muf->FullPath; jval[0u] = muf->FullPath;
jval[1u] = cmStrCat(muf->MocIt ? 'M' : 'm', jval[1u] = cmStrCat(muf->MocIt ? 'M' : 'm',
muf->UicIt ? 'U' : 'u'); muf->UicIt ? 'U' : 'u');
jval[2u] = cfgArray(muf->Configs); jval[2u] = this->GetMocBuildPath(*muf);
jval[3u] = this->GetMocBuildPath(*muf); jval[3u] = cfgArray(muf->Configs);
}); });
info.SetArrayArray( info.SetArrayArray(
"SOURCES", sources, [&cfgArray](Json::Value& jval, MUFile const* muf) { "SOURCES", sources, [&cfgArray](Json::Value& jval, MUFile const* muf) {

4
Source/cmQtAutoMocUic.cxx
View File

@@ -2520,8 +2520,8 @@ bool cmQtAutoMocUicT::InitFromInfo(InfoT const& info)
Json::Value const& entryName = entry[0u]; Json::Value const& entryName = entry[0u];
Json::Value const& entryFlags = entry[1u]; Json::Value const& entryFlags = entry[1u];
Json::Value const& entryConfigs = entry[2u]; Json::Value const& entryBuild = entry[2u];
Json::Value const& entryBuild = entry[3u]; Json::Value const& entryConfigs = entry[3u];
if (testEntry(entryName.isString(), if (testEntry(entryName.isString(),
"JSON value for name is not a string.") || "JSON value for name is not a string.") ||
testEntry(entryFlags.isString(), testEntry(entryFlags.isString(),