diff options
-rw-r--r-- | src/plugins/cmakeprojectmanager/fileapidataextractor.cpp | 2 | ||||
-rw-r--r-- | src/plugins/cmakeprojectmanager/fileapiparser.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp index 2cd3782e75..6c5f7791e2 100644 --- a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp +++ b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp @@ -581,6 +581,8 @@ std::pair<std::unique_ptr<CMakeProjectNode>, QSet<FilePath>> generateRootProject = findOrDefault(data.codemodel.projects, equal(&FileApiDetails::Project::parent, -1)); if (!topLevelProject.name.isEmpty()) result.first->setDisplayName(topLevelProject.name); + else + result.first->setDisplayName(sourceDirectory.fileName()); QHash<FilePath, ProjectNode *> cmakeListsNodes = addCMakeLists(result.first.get(), std::move(data.cmakeListNodes)); diff --git a/src/plugins/cmakeprojectmanager/fileapiparser.cpp b/src/plugins/cmakeprojectmanager/fileapiparser.cpp index f1eb1e8aaa..e60040f703 100644 --- a/src/plugins/cmakeprojectmanager/fileapiparser.cpp +++ b/src/plugins/cmakeprojectmanager/fileapiparser.cpp @@ -306,7 +306,7 @@ static std::vector<Project> extractProjects(const QJsonArray &projects, QString qCDebug(cmakeFileApi) << "Project read:" << project.name << project.directories; - if (project.name.isEmpty() || project.directories.empty()) { + if (project.directories.empty()) { errorMessage = QCoreApplication::translate( "CMakeProjectManager::Internal", "Invalid codemodel file generated by CMake: Broken project data."); |