From 86c4416af6c0ab08acab33b9b34abd9cdebfa5a1 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 30 Jul 2019 11:52:43 +0200 Subject: [PATCH] CMake: Handle environment changes in cmake better Handle environment changes in cmake better. Server-mode will trigger an reader-change when the environment changes. This has not been considered so far and a reader-change triggered by an environment change was considered an error (and ignored). Change-Id: I2d0baadbcfc86e04348c75d8e5997817bdc233a5 Reviewed-by: Cristian Adam Reviewed-by: Eike Ziller --- src/plugins/cmakeprojectmanager/cmakeproject.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index 298210dea03..e0182809a48 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -204,9 +204,9 @@ CMakeProject::CMakeProject(const FilePath &fileName) : Project(Constants::CMAKEM // * Error out if the reader updates, cannot happen since all BCs share a target/kit. // * run cmake without configuration arguments if the reader stays m_buildDirManager.setParametersAndRequestParse( - BuildDirParameters(senderBc), - BuildDirManager::REPARSE_FAIL, - BuildDirManager::REPARSE_CHECK_CONFIGURATION); + BuildDirParameters(senderBc), + BuildDirManager::REPARSE_CHECK_CONFIGURATION, // server-mode might need a restart... + BuildDirManager::REPARSE_CHECK_CONFIGURATION); } }); subscribeSignal(&CMakeBuildConfiguration::buildDirectoryChanged, this, [this]() {