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

CMake: Fix server-mode trimming out targets every second time

Browse Source 
Do not trim out targets every second time the project tree is generated.

Change-Id: I6ed9cd7bb6b2e88ec6dbe063f90719ffacffdd61
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Tobias Hunger
2016-11-15 17:26:08 +01:00
parent 7b467cbad6
commit eff0768100
2 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/cmakeprojectmanager/servermodereader.cpp
View File

@@ -672,12 +672,11 @@ QSet<Node *> ServerModeReader::updateTargets(CMakeListsNode *root,
{ {
QSet<Node *> usedNodes; QSet<Node *> usedNodes;
for (const Target *t : targets) { for (const Target *t : targets) {
CMakeTargetNode *tNode = findOrCreateTargetNode(root, t->sourceDirectory, t->name); CMakeTargetNode *tNode = findOrCreateTargetNode(root, t->sourceDirectory, t->name);
tNode->setTargetInformation(t->artifacts, t->type); tNode->setTargetInformation(t->artifacts, t->type);
usedNodes.insert(tNode); // always keep the target node: FileGroups use buildTree!
usedNodes.unite(updateFileGroups(tNode, t->sourceDirectory, t->buildDirectory, updateFileGroups(tNode, t->sourceDirectory, t->buildDirectory, t->fileGroups, headers);
t->fileGroups, headers));
} }
return usedNodes; return usedNodes;
} }
@@ -695,13 +694,12 @@ static Utils::FileName mapFileName(const Utils::FileName &fn, const Utils::FileN
return fn; return fn;
} }
QSet<Node *> ServerModeReader::updateFileGroups(ProjectNode *targetRoot, void ServerModeReader::updateFileGroups(ProjectNode *targetRoot,
const Utils::FileName &sourceDirectory, const Utils::FileName &sourceDirectory,
const Utils::FileName &buildDirectory, const Utils::FileName &buildDirectory,
const QList<ServerModeReader::FileGroup *> &fileGroups, const QList<ServerModeReader::FileGroup *> &fileGroups,
const QHash<FileName, QList<FileNode *> > &headers) const QHash<FileName, QList<FileNode *> > &headers)
{ {
QSet<Node *> usedNodes;
QList<FileNode *> toList; QList<FileNode *> toList;
QSet<Utils::FileName> alreadyListed; QSet<Utils::FileName> alreadyListed;
for (const FileGroup *f : fileGroups) { for (const FileGroup *f : fileGroups) {
@@ -733,11 +731,6 @@ QSet<Node *> ServerModeReader::updateFileGroups(ProjectNode *targetRoot,
} }
targetRoot->buildTree(toList, sourceDirectory); targetRoot->buildTree(toList, sourceDirectory);
foreach (FileNode *fn, toList)
usedNodes.insert(static_cast<Node *>(fn)); // Mark all leaves as keeper!
return usedNodes;
} }
} // namespace Internal } // namespace Internal

10
src/plugins/cmakeprojectmanager/servermodereader.h
View File

@@ -127,11 +127,11 @@ private:
QSet<ProjectExplorer::Node *> updateTargets(CMakeListsNode *root, QSet<ProjectExplorer::Node *> updateTargets(CMakeListsNode *root,
const QList<Target *> &targets, const QList<Target *> &targets,
const QHash<Utils::FileName, QList<ProjectExplorer::FileNode *>> &headers); const QHash<Utils::FileName, QList<ProjectExplorer::FileNode *>> &headers);
QSet<ProjectExplorer::Node *> updateFileGroups(ProjectExplorer::ProjectNode *targetRoot, void updateFileGroups(ProjectExplorer::ProjectNode *targetRoot,
const Utils::FileName &sourceDirectory, const Utils::FileName &sourceDirectory,
const Utils::FileName &buildDirectory, const Utils::FileName &buildDirectory,
const QList<FileGroup *> &fileGroups, const QList<FileGroup *> &fileGroups,
const QHash<Utils::FileName, QList<ProjectExplorer::FileNode *>> &headers); const QHash<Utils::FileName, QList<ProjectExplorer::FileNode *>> &headers);
bool m_hasData = false; bool m_hasData = false;