Commit fc2fad44 authored by Daniel Teske's avatar Daniel Teske
Browse files

CMakeProjectManager: Ensure that toolchain paths are last



Task-number: QTCREATORBUG-3959
Change-Id: I93a19af8309933a51d26f94980088c0f244cc84f
Reviewed-by: default avatarNikolai Kosjar <nikolai.kosjar@digia.com>
parent 765ad6c3
......@@ -342,11 +342,6 @@ bool CMakeProject::parseCMakeLists()
part->displayName = displayName();
part->projectFile = projectFilePath();
part->evaluateToolchain(tc,
cxxflags,
cxxflags,
SysRootKitInformation::sysRoot(k));
// This explicitly adds -I. to the include paths
part->includePaths += projectDirectory();
......@@ -371,6 +366,11 @@ bool CMakeProject::parseCMakeLists()
foreach (const QString &file, m_files)
adder.maybeAdd(file);
part->evaluateToolchain(tc,
cxxflags,
cxxflags,
SysRootKitInformation::sysRoot(k));
pinfo.appendProjectPart(part);
m_codeModelFuture.cancel();
m_codeModelFuture = modelmanager->updateProjectInfo(pinfo);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment