From fc2fad44e01817e376ea7a58c00c7102563d68d0 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Mon, 31 Mar 2014 11:27:56 +0200 Subject: [PATCH] CMakeProjectManager: Ensure that toolchain paths are last Task-number: QTCREATORBUG-3959 Change-Id: I93a19af8309933a51d26f94980088c0f244cc84f Reviewed-by: Nikolai Kosjar --- src/plugins/cmakeprojectmanager/cmakeproject.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index 70862762e64..1658e22807e 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -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);