From d5383c92a8392b6a89584f6e823bdc1378d00264 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 7 Jun 2019 17:11:03 +0200 Subject: [PATCH] CMake: Run cmake with all arguments when no CMakeCache.txt file is found Always run cmake with all arguments when no CMakeCache.txt file is found. This allows for the builddirreaders to become a bit simpler. Change-Id: I67839fd560fb77f6832b1cefc3ff016baa6bae89 Reviewed-by: Eike Ziller --- src/plugins/cmakeprojectmanager/builddirmanager.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/cmakeprojectmanager/builddirmanager.cpp b/src/plugins/cmakeprojectmanager/builddirmanager.cpp index dee7f110230..54776ed122d 100644 --- a/src/plugins/cmakeprojectmanager/builddirmanager.cpp +++ b/src/plugins/cmakeprojectmanager/builddirmanager.cpp @@ -285,7 +285,9 @@ void BuildDirManager::parse(int reparseParameters) TaskHub::clearTasks(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM); - if (reparseParameters & REPARSE_CHECK_CONFIGURATION) { + if (m_parameters.workDirectory.toFileInfo().exists("CMakeCache.txt")) { + reparseParameters |= REPARSE_FORCE_CONFIGURATION | REPARSE_FORCE_CMAKE_RUN; + } else if (reparseParameters & REPARSE_CHECK_CONFIGURATION) { if (checkConfiguration()) reparseParameters |= REPARSE_FORCE_CONFIGURATION; }