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

CMake server-mode: Use more robust logic

Browse Source 
Use a more robust logic to find existing CMakeListsNodes again.

Change-Id: Id26031c1164eb6271b74ccf39071219938b285fc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-02-07 22:31:41 +01:00
parent c20ae42e20
commit 0e25c08942
1 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -570,32 +570,23 @@ void ServerModeReader::addCMakeLists(CMakeListsNode *root, const QList<FileNode
static CMakeListsNode *findCMakeNode(CMakeListsNode *root, const Utils::FileName &dir)
{
Utils::FileName stepDir = dir;
const Utils::FileName stepDir = dir;
const Utils::FileName topDir = root->filePath().parentDir();
CMakeListsNode *base = root;
forever {
Utils::FileName stepLists = stepDir;
stepLists.appendPath("CMakeLists.txt");
QStringList relative = stepDir.relativeChildPath(topDir).toString().split('/');
CMakeListsNode *cmln = nullptr;
if (base->filePath() == stepLists) {
cmln = base;
} else {
ProjectNode *pcmln = base->projectNode(stepLists);
cmln = static_cast<CMakeListsNode *>(pcmln);
}
CMakeListsNode *result = root;
if (!cmln) {
stepDir = stepDir.parentDir();
if (stepDir.isEmpty())
return nullptr;
} else {
if (cmln->filePath().parentDir() == dir)
return cmln;
stepDir = dir;
base = cmln;
}
while (!relative.isEmpty()) {
const QString nextPathElement = relative.takeFirst();
if (nextPathElement.isEmpty())
continue;
const QString nextFullPath
= result->filePath().parentDir().toString() + '/' + nextPathElement + "/CMakeLists.txt";
result = static_cast<CMakeListsNode *>(result->projectNode(Utils::FileName::fromString(nextFullPath)));
QTC_ASSERT(result, return nullptr);
}
return result;
}
static CMakeProjectNode *findOrCreateProjectNode(CMakeListsNode *root, const Utils::FileName &dir,