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

CMake: Simplify reparsing logic

Browse Source 
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 <cristian.adam@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2019-07-30 11:16:00 +02:00
parent 83355540bf
commit 16fe5fe109
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/cmakeprojectmanager/builddirmanager.cpp
View File

@@ -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