From 16fe5fe109a8b4194859894c250b5553ea5d945e Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 30 Jul 2019 11:16:00 +0200 Subject: [PATCH] CMake: Simplify reparsing logic Do not overload the "new reader" logic with the logic for "no CMakeCache.txt" file. This makes it a bit simpler to reason about the different conditions when the options are applied. Note that "no CMakeCache.txt" is handled later anyway by adding the "REPARSE_FORCE_CMAKE_RUN" flag. Change-Id: Icc9455152053911cc839a19c76d3c0e44fc76fcf Reviewed-by: Cristian Adam Reviewed-by: Eike Ziller --- .../cmakeprojectmanager/builddirmanager.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/builddirmanager.cpp b/src/plugins/cmakeprojectmanager/builddirmanager.cpp index f029d9cdab9..a5cb3715390 100644 --- a/src/plugins/cmakeprojectmanager/builddirmanager.cpp +++ b/src/plugins/cmakeprojectmanager/builddirmanager.cpp @@ -216,17 +216,10 @@ void BuildDirManager::setParametersAndRequestParse(const BuildDirParameters &par updateReaderType(m_parameters, [this, old, newReaderReparseOptions, existingReaderReparseOptions]() { - int options = REPARSE_DEFAULT; - if (old != m_reader.get()) { - options = newReaderReparseOptions; - } else { - if (!QFileInfo::exists(m_parameters.workDirectory.toString() + "/CMakeCache.txt")) - options = newReaderReparseOptions; - else - options = existingReaderReparseOptions; - } - emit requestReparse(options); - }); + int options = (old != m_reader.get()) ? newReaderReparseOptions + : existingReaderReparseOptions; + emit requestReparse(options); + }); } CMakeBuildConfiguration *BuildDirManager::buildConfiguration() const