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

CMake: Fix build directory location in fileapi and tealeaf reader

Browse Source 
Sorry, this was wrong in 196b0da08a

Change-Id: Id2d6a5fb180ccc74c6fea0559466f8e390de69e8
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Tobias Hunger
2019-10-18 16:27:37 +02:00
parent 196b0da08a
commit 97855766bd
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cmakeprojectmanager/fileapireader.cpp
View File

@@ -131,7 +131,7 @@ void FileApiReader::parse(bool forceCMakeRun, bool forceConfiguration)
if (forceConfiguration) { if (forceConfiguration) {
// Initial create: // Initial create:
qCDebug(cmakeFileApiMode) << "FileApiReader: Starting CMake with forced configuration."; 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()})); startCMakeState(QStringList({QString("-C"), path.toUserOutput()}));
// Keep m_isParsing enabled! // Keep m_isParsing enabled!
return; return;

2
src/plugins/cmakeprojectmanager/tealeafreader.cpp
View File

@@ -133,7 +133,7 @@ void TeaLeafReader::parse(bool forceCMakeRun, bool forceConfiguration)
const QFileInfo cbpFileFi = cbpFile.isEmpty() ? QFileInfo() : QFileInfo(cbpFile); const QFileInfo cbpFileFi = cbpFile.isEmpty() ? QFileInfo() : QFileInfo(cbpFile);
if (!cbpFileFi.exists() || forceConfiguration) { if (!cbpFileFi.exists() || forceConfiguration) {
// Initial create: // 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()})); startCMake(QStringList({QString("-C"), path.toUserOutput()}));
return; return;
} }