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

CMake: Handle files being in multiple targets when parsing cbp files

Browse Source 
Change-Id: Ic85a7318e91e8a10a48c8433f22947fb71071832
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Tobias Hunger
2016-08-17 12:45:53 +02:00
parent 53747b76dd
commit c44e5826e7
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmakecbpparser.h
View File

@@ -72,7 +72,7 @@ private:
void parseUnknownElement();
void sortFiles();
QMap<Utils::FileName, QString> m_unitTargetMap;
QMap<Utils::FileName, QStringList> m_unitTargetMap;
const ProjectExplorer::Kit *m_kit = 0;
QList<ProjectExplorer::FileNode *> m_fileList;
QList<ProjectExplorer::FileNode *> m_cmakeFileList;
@@ -85,7 +85,7 @@ private:
QString m_compiler;
QString m_sourceDirectory;
QString m_buildDirectory;
QString m_unitTarget;
QStringList m_unitTargets;
};
} // namespace Internal