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

CMake: Use a CMakeProjectNode as top level cmake node

Browse Source 
Change-Id: I6e68b971cf490b9b064a2866bd99865a7f4a7bd9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-03-14 15:35:02 +01:00
parent b8417e0f0c
commit 6e91fe5046
10 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,8 @@
namespace CMakeProjectManager {
namespace Internal {
class CMakeListsNode;
class ServerModeReader : public BuildDirReader
{
Q_OBJECT
@@ -54,7 +56,7 @@ public:
QList<CMakeBuildTarget> buildTargets() const final;
CMakeConfig takeParsedConfiguration() final;
void generateProjectTree(CMakeListsNode *root,
void generateProjectTree(CMakeProjectNode *root,
const QList<const ProjectExplorer::FileNode *> &allFiles) final;
void updateCodeModel(CppTools::RawProjectParts &rpps) final;
@@ -111,10 +113,10 @@ private:
void extractCMakeInputsData(const QVariantMap &data);
void extractCacheData(const QVariantMap &data);
void addCMakeLists(CMakeListsNode *root, const QList<ProjectExplorer::FileNode *> &cmakeLists);
void addProjects(CMakeListsNode *root, const QList<Project *> &projects,
void addCMakeLists(CMakeProjectNode *root, const QList<ProjectExplorer::FileNode *> &cmakeLists);
void addProjects(CMakeProjectNode *root, const QList<Project *> &projects,
const QList<const ProjectExplorer::FileNode *> &allFiles);
void addTargets(CMakeListsNode *root, const QList<Target *> &targets,
void addTargets(CMakeProjectNode *root, const QList<Target *> &targets,
const QHash<Utils::FileName, QList<const ProjectExplorer::FileNode *>> &headers);
void addFileGroups(ProjectExplorer::ProjectNode *targetRoot,
const Utils::FileName &sourceDirectory,