From 97855766bd05e90d9b2515326d44358472aa5c24 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 18 Oct 2019 16:27:37 +0200 Subject: [PATCH] CMake: Fix build directory location in fileapi and tealeaf reader Sorry, this was wrong in 196b0da08add8b36a118481314bd10a3a3dd78e0 Change-Id: Id2d6a5fb180ccc74c6fea0559466f8e390de69e8 Reviewed-by: Cristian Adam Reviewed-by: Tobias Hunger --- src/plugins/cmakeprojectmanager/fileapireader.cpp | 2 +- src/plugins/cmakeprojectmanager/tealeafreader.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/fileapireader.cpp b/src/plugins/cmakeprojectmanager/fileapireader.cpp index f15711f766b..0ef2df33701 100644 --- a/src/plugins/cmakeprojectmanager/fileapireader.cpp +++ b/src/plugins/cmakeprojectmanager/fileapireader.cpp @@ -131,7 +131,7 @@ void FileApiReader::parse(bool forceCMakeRun, bool forceConfiguration) if (forceConfiguration) { // Initial create: qCDebug(cmakeFileApiMode) << "FileApiReader: Starting CMake with forced configuration."; - const FilePath path = m_parameters.buildDirectory.pathAppended("qtcsettings.cmake"); + const FilePath path = m_parameters.workDirectory.pathAppended("qtcsettings.cmake"); startCMakeState(QStringList({QString("-C"), path.toUserOutput()})); // Keep m_isParsing enabled! return; diff --git a/src/plugins/cmakeprojectmanager/tealeafreader.cpp b/src/plugins/cmakeprojectmanager/tealeafreader.cpp index a0fba9ca60f..31f13234a6e 100644 --- a/src/plugins/cmakeprojectmanager/tealeafreader.cpp +++ b/src/plugins/cmakeprojectmanager/tealeafreader.cpp @@ -133,7 +133,7 @@ void TeaLeafReader::parse(bool forceCMakeRun, bool forceConfiguration) const QFileInfo cbpFileFi = cbpFile.isEmpty() ? QFileInfo() : QFileInfo(cbpFile); if (!cbpFileFi.exists() || forceConfiguration) { // Initial create: - const FilePath path = m_parameters.buildDirectory.pathAppended("qtcsettings.cmake"); + const FilePath path = m_parameters.workDirectory.pathAppended("qtcsettings.cmake"); startCMake(QStringList({QString("-C"), path.toUserOutput()})); return; }