CMake server-mode: Keep settings

Keep settings when switching from the temporary build directory to the
real one using cmake with server-mode.

Task-number: QTCREATORBUG-17360
Change-Id: If36489cb2584dc5e0b021430e5d860e146fd8a86
Reviewed-by: Florian Apolloner <florian@apolloner.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-01-18 14:26:02 +01:00
parent f581ad7ded
commit 0f7d75ccf5

View File

@@ -144,7 +144,7 @@ void ServerModeReader::parse(bool force)
QTC_ASSERT(m_cmakeServer, return);
QVariantMap extra;
if (force) {
if (force || !QDir(m_parameters.buildDirectory.toString()).exists("CMakeCache.txt")) {
QStringList cacheArguments = transform(m_parameters.configuration,
[this](const CMakeConfigItem &i) {
return i.toArgument(m_parameters.expander);