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

CMake: Report cache configuration arguments in server-mode

Browse Source 
Change-Id: I3cd7a9ac37a1b8c3c6018070c6fdc506abedd736
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-09-29 13:49:17 +02:00
parent 7ae35898b5
commit 2dabdbd2fe
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,7 +160,6 @@ void ServerModeReader::resetData()
void ServerModeReader::parse(bool force) void ServerModeReader::parse(bool force)
{ {
emit configurationStarted(); emit configurationStarted();
Core::MessageManager::write(tr("Starting to parse CMake project."));
QTC_ASSERT(m_cmakeServer, return); QTC_ASSERT(m_cmakeServer, return);
QVariantMap extra; QVariantMap extra;
@@ -169,9 +168,13 @@ void ServerModeReader::parse(bool force)
[this](const CMakeConfigItem &i) { [this](const CMakeConfigItem &i) {
return i.toArgument(m_parameters.expander); return i.toArgument(m_parameters.expander);
}); });
Core::MessageManager::write(tr("Starting to parse CMake project, using: \"%1\".")
.arg(cacheArguments.join("\", \"")));
cacheArguments.prepend(QString()); // Work around a bug in CMake 3.7.0 and 3.7.1 where cacheArguments.prepend(QString()); // Work around a bug in CMake 3.7.0 and 3.7.1 where
// the first argument gets lost! // the first argument gets lost!
extra.insert("cacheArguments", QVariant(cacheArguments)); extra.insert("cacheArguments", QVariant(cacheArguments));
} else {
Core::MessageManager::write(tr("Starting to parse CMake project."));
} }
m_future.reset(new QFutureInterface<void>()); m_future.reset(new QFutureInterface<void>());