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

CMakeProject: Better order of include directories

Browse Source 
Project directories should come before system directories.

Task-Nr: QTCREATORBUG-3959
This commit is contained in:
dt
2011-03-10 13:48:49 +01:00
parent 53298420ed
commit ffd6d307a0
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -285,7 +285,11 @@ bool CMakeProject::parseCMakeLists()
if (!activeBC->toolChain())
return true;
QStringList allIncludePaths;
QStringList allIncludePaths;
// This explicitly adds -I. to the include paths
allIncludePaths.append(projectDirectory());
allIncludePaths.append(cbpparser.includeFiles());
QStringList allFrameworkPaths;
QList<ProjectExplorer::HeaderPath> allHeaderPaths = activeBC->toolChain()->systemHeaderPaths();
foreach (const ProjectExplorer::HeaderPath &headerPath, allHeaderPaths) {
@@ -294,10 +298,7 @@ bool CMakeProject::parseCMakeLists()
else
allIncludePaths.append(headerPath.path());
}
// This explicitly adds -I. to the include paths
allIncludePaths.append(projectDirectory());
allIncludePaths.append(cbpparser.includeFiles());
CPlusPlus::CppModelManagerInterface *modelmanager =
CPlusPlus::CppModelManagerInterface::instance();
if (modelmanager) {