feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Move CMakeTool merging into separate function

Browse Source 
Change-Id: I7c70e0aa09def8c7483d183791a76e56be18a0a4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2018-06-29 13:29:43 +02:00
parent f5d51dcb69
commit 9c1fd4c2aa
1 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/plugins/cmakeprojectmanager/cmaketoolmanager.cpp
View File

@@ -190,6 +190,47 @@ static QList<CMakeTool *> autoDetectCMakeTools()
return found; return found;
} }
static QList<CMakeTool *> mergeTools(QList<CMakeTool *> &sdkTools,
QList<CMakeTool *> &userTools,
QList<CMakeTool *> &autoDetectedTools)
{
QList<CMakeTool *> result;
for (int i = userTools.size() - 1; i >= 0; i--) {
CMakeTool *currTool = userTools.takeAt(i);
if (CMakeTool *sdk = Utils::findOrDefault(sdkTools, Utils::equal(&CMakeTool::id, currTool->id()))) {
delete currTool;
result.append(sdk);
} else {
//if the current tool is marked as autodetected and NOT in the autodetected list,
//it is a leftover SDK provided tool. The user will not be able to edit it,
//so we automatically drop it
if (currTool->isAutoDetected()) {
if (!Utils::anyOf(autoDetectedTools,
Utils::equal(&CMakeTool::cmakeExecutable, currTool->cmakeExecutable()))) {
qWarning() << QString::fromLatin1("Previously SDK provided CMakeTool \"%1\" (%2) dropped.")
.arg(currTool->cmakeExecutable().toUserOutput(), currTool->id().toString());
delete currTool;
continue;
}
}
result.append(currTool);
}
}
//filter out the tools that are already known
while (autoDetectedTools.size()) {
CMakeTool *currTool = autoDetectedTools.takeFirst();
if (Utils::anyOf(result,
Utils::equal(&CMakeTool::cmakeExecutable, currTool->cmakeExecutable())))
delete currTool;
else
result.append(currTool);
}
return result;
}
// -------------------------------------------------------------------- // --------------------------------------------------------------------
// CMakeToolManager: // CMakeToolManager:
// -------------------------------------------------------------------- // --------------------------------------------------------------------
@@ -318,7 +359,7 @@ void CMakeToolManager::restoreCMakeTools()
{ {
Core::Id defaultId; Core::Id defaultId;
FileName sdkSettingsFile = FileName::fromString(ICore::installerResourcePath() const FileName sdkSettingsFile = FileName::fromString(ICore::installerResourcePath()
+ CMAKETOOL_FILENAME); + CMAKETOOL_FILENAME);
QList<CMakeTool *> sdkTools = readCMakeTools(sdkSettingsFile, &defaultId, true); QList<CMakeTool *> sdkTools = readCMakeTools(sdkSettingsFile, &defaultId, true);
@@ -330,40 +371,7 @@ void CMakeToolManager::restoreCMakeTools()
QList<CMakeTool *> autoDetectedTools = autoDetectCMakeTools(); QList<CMakeTool *> autoDetectedTools = autoDetectCMakeTools();
//filter out the tools that were stored in SDK //filter out the tools that were stored in SDK
QList<CMakeTool *> toRegister; const QList<CMakeTool *> toRegister = mergeTools(sdkTools, userTools, autoDetectedTools);
for (int i = userTools.size() - 1; i >= 0; i--) {
CMakeTool *currTool = userTools.takeAt(i);
if (CMakeTool *sdk = Utils::findOrDefault(sdkTools, Utils::equal(&CMakeTool::id, currTool->id()))) {
delete currTool;
toRegister.append(sdk);
} else {
//if the current tool is marked as autodetected and NOT in the autodetected list,
//it is a leftover SDK provided tool. The user will not be able to edit it,
//so we automatically drop it
if (currTool->isAutoDetected()) {
if (!Utils::anyOf(autoDetectedTools,
Utils::equal(&CMakeTool::cmakeExecutable, currTool->cmakeExecutable()))) {
qWarning() << QString::fromLatin1("Previously SDK provided CMakeTool \"%1\" (%2) dropped.")
.arg(currTool->cmakeExecutable().toUserOutput(), currTool->id().toString());
delete currTool;
continue;
}
}
toRegister.append(currTool);
}
}
//filter out the tools that are already known
while (autoDetectedTools.size()) {
CMakeTool *currTool = autoDetectedTools.takeFirst();
if (Utils::anyOf(toRegister,
Utils::equal(&CMakeTool::cmakeExecutable, currTool->cmakeExecutable())))
delete currTool;
else
toRegister.append(currTool);
}
// Store all tools // Store all tools
foreach (CMakeTool *current, toRegister) { foreach (CMakeTool *current, toRegister) {