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

CMake: fix definition composing in ServerModeReader

Browse Source 
CMake uses definitions with assign operator notation, so, we should
replace first assign operator with space to omit parser damage.

Change-Id: I795c4371a1fdd534a42eb01bdcbe852534ce2bcf
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Alexander Drozdov
2017-01-16 13:18:51 +10:00
committed by Tobias Hunger
parent 6871f31b4e
commit 3ff3a19207
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -328,7 +328,13 @@ QSet<Core::Id> ServerModeReader::updateCodeModel(CppTools::ProjectPartBuilder &p
foreach (const FileGroup *fg, m_fileGroups) { foreach (const FileGroup *fg, m_fileGroups) {
++counter; ++counter;
const QString defineArg const QString defineArg
= transform(fg->defines, [](const QString &s) -> QString { return QString::fromLatin1("#define ") + s; }).join('\n'); = transform(fg->defines, [](const QString &s) -> QString {
QString result = QString::fromLatin1("#define ") + s;
int assignIndex = result.indexOf('=');
if (assignIndex != -1)
result[assignIndex] = ' ';
return result;
}).join('\n');
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(); });