From 80d18c1e5746f912dfeeff84cc38745446b37009 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Thu, 3 Jun 2021 12:08:16 +0200 Subject: CMakePM: Do backup/restore configuration for all cases When "Auto create build directories" is not checked, then the first configuration is done in /tmp, which is covered by workDirectory. Change-Id: Iad65b4776433ce296bd2561195fcf1bb6f8ace1d Reviewed-by: Eike Ziller --- src/plugins/cmakeprojectmanager/fileapireader.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/fileapireader.cpp b/src/plugins/cmakeprojectmanager/fileapireader.cpp index a4a2471073..e5172e6f6e 100644 --- a/src/plugins/cmakeprojectmanager/fileapireader.cpp +++ b/src/plugins/cmakeprojectmanager/fileapireader.cpp @@ -312,8 +312,8 @@ void FileApiReader::endState(const QFileInfo &replyFi) void FileApiReader::makeBackupConfiguration(bool store) { - FilePath reply = m_parameters.buildDirectory.pathAppended(".cmake/api/v1/reply"); - FilePath replyPrev = m_parameters.buildDirectory.pathAppended(".cmake/api/v1/reply.prev"); + FilePath reply = m_parameters.workDirectory.pathAppended(".cmake/api/v1/reply"); + FilePath replyPrev = m_parameters.workDirectory.pathAppended(".cmake/api/v1/reply.prev"); if (!store) std::swap(reply, replyPrev); @@ -327,8 +327,8 @@ void FileApiReader::makeBackupConfiguration(bool store) } - FilePath cmakeCacheTxt = m_parameters.buildDirectory.pathAppended("CMakeCache.txt"); - FilePath cmakeCacheTxtPrev = m_parameters.buildDirectory.pathAppended("CMakeCache.txt.prev"); + FilePath cmakeCacheTxt = m_parameters.workDirectory.pathAppended("CMakeCache.txt"); + FilePath cmakeCacheTxtPrev = m_parameters.workDirectory.pathAppended("CMakeCache.txt.prev"); if (!store) std::swap(cmakeCacheTxt, cmakeCacheTxtPrev); -- cgit v1.2.3