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

CMake: Set project file information (when available)

Browse Source 
Change-Id: I854a0207bd8568bc8f324840cba52dfb3ca880e9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-01-27 11:41:55 +01:00
parent 0656370976
commit 36a49ed103
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cmakeprojectmanager/servermodereader.cpp
View File

@@ -312,7 +312,7 @@ QSet<Core::Id> ServerModeReader::updateCodeModel(CppTools::ProjectPartBuilder &p
const QStringList flags = QtcProcess::splitArgs(fg->compileFlags); const QStringList flags = QtcProcess::splitArgs(fg->compileFlags);
const QStringList includes = transform(fg->includePaths, [](const IncludePath *ip) { return ip->path.toString(); }); const QStringList includes = transform(fg->includePaths, [](const IncludePath *ip) { return ip->path.toString(); });
ppBuilder.setProjectFile(fg->target->sourceDirectory.toString()); ppBuilder.setProjectFile(fg->target->sourceDirectory.toString() + "/CMakeLists.txt");
ppBuilder.setDisplayName(fg->target->name + QString::number(counter)); ppBuilder.setDisplayName(fg->target->name + QString::number(counter));
ppBuilder.setDefines(defineArg.toUtf8()); ppBuilder.setDefines(defineArg.toUtf8());
ppBuilder.setIncludePaths(includes); ppBuilder.setIncludePaths(includes);

1
src/plugins/cmakeprojectmanager/tealeafreader.cpp
View File

@@ -340,6 +340,7 @@ QSet<Id> TeaLeafReader::updateCodeModel(CppTools::ProjectPartBuilder &ppBuilder)
includePaths = transform(cbt.includeFiles, &FileName::toString); includePaths = transform(cbt.includeFiles, &FileName::toString);
} }
includePaths += m_parameters.buildDirectory.toString(); includePaths += m_parameters.buildDirectory.toString();
ppBuilder.setProjectFile(QString()); // No project file information available!
ppBuilder.setIncludePaths(includePaths); ppBuilder.setIncludePaths(includePaths);
ppBuilder.setCFlags(cflags); ppBuilder.setCFlags(cflags);
ppBuilder.setCxxFlags(cxxflags); ppBuilder.setCxxFlags(cxxflags);