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

CMakeProjectManager: Ensure that toolchain paths are last

Browse Source 
Task-number: QTCREATORBUG-3959
Change-Id: I93a19af8309933a51d26f94980088c0f244cc84f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Daniel Teske
2014-03-31 11:27:56 +02:00
parent 765ad6c3d2
commit fc2fad44e0
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -342,11 +342,6 @@ bool CMakeProject::parseCMakeLists()
part->displayName = displayName(); part->displayName = displayName();
part->projectFile = projectFilePath(); part->projectFile = projectFilePath();
part->evaluateToolchain(tc,
cxxflags,
cxxflags,
SysRootKitInformation::sysRoot(k));
// This explicitly adds -I. to the include paths // This explicitly adds -I. to the include paths
part->includePaths += projectDirectory(); part->includePaths += projectDirectory();
@@ -371,6 +366,11 @@ bool CMakeProject::parseCMakeLists()
foreach (const QString &file, m_files) foreach (const QString &file, m_files)
adder.maybeAdd(file); adder.maybeAdd(file);
part->evaluateToolchain(tc,
cxxflags,
cxxflags,
SysRootKitInformation::sysRoot(k));
pinfo.appendProjectPart(part); pinfo.appendProjectPart(part);
m_codeModelFuture.cancel(); m_codeModelFuture.cancel();
m_codeModelFuture = modelmanager->updateProjectInfo(pinfo); m_codeModelFuture = modelmanager->updateProjectInfo(pinfo);