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

CMakeProjectManager: Support mapping chroot include paths

Browse Source 
Provide a way for plugins to map include paths into a build chroot.
Plugins can register a path mapper if required, otherwise the paths
are not touched.

Change-Id: I621982831fa354d6d0f558a6c1dce4e014421f12
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Benjamin Zeller
2015-03-10 15:47:09 +01:00
parent 9f7c801e4d
commit 255b5850e2
7 changed files with 62 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -246,12 +246,14 @@ bool CMakeProject::parseCMakeLists()
return false;
}
Kit *k = activeTarget()->kit();
// setFolderName
m_rootNode->setDisplayName(QFileInfo(cbpFile).completeBaseName());
CMakeCbpParser cbpparser;
// Parsing
//qDebug()<<"Parsing file "<<cbpFile;
if (!cbpparser.parseCbpFile(cbpFile, projectDirectory().toString())) {
if (!cbpparser.parseCbpFile(k,cbpFile, projectDirectory().toString())) {
// TODO report error
emit buildTargetsChanged();
return false;
@@ -305,7 +307,6 @@ bool CMakeProject::parseCMakeLists()
createUiCodeModelSupport();
Kit *k = activeTarget()->kit();
ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(k);
if (!tc) {
emit buildTargetsChanged();