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

CMake: Cache cmake configuration only once

Browse Source 
This fixes saves memory and fixes some update issues with the cmake
configuration, where the three layers of caches used to interfere
with each other.

Task-number: QTCREATORBUG-17360
Change-Id: I5564bbe46ca8de6b38dd710100bfc18fad98eac5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2016-12-01 15:25:32 +01:00
parent 5a88e4c9ad
commit 63c0fbc4e4
8 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,7 +163,6 @@ void TeaLeafReader::resetData()
qDeleteAll(m_watchedFiles);
m_watchedFiles.clear();
m_cmakeCache.clear();
m_projectName.clear();
m_buildTargets.clear();
qDeleteAll(m_files);
@@ -221,7 +220,7 @@ QList<CMakeBuildTarget> TeaLeafReader::buildTargets() const
return m_buildTargets;
}
CMakeConfig TeaLeafReader::parsedConfiguration() const
CMakeConfig TeaLeafReader::takeParsedConfiguration()
{
CMakeConfig result;
FileName cacheFile = m_parameters.buildDirectory;
@@ -229,11 +228,11 @@ CMakeConfig TeaLeafReader::parsedConfiguration() const
if (!cacheFile.exists())
return result;
QString errorMessage;
m_cmakeCache = CMakeConfigItem::itemsFromFile(cacheFile, &errorMessage);
result = CMakeConfigItem::itemsFromFile(cacheFile, &errorMessage);
if (!errorMessage.isEmpty())
emit errorOccured(errorMessage);
const FileName sourceOfBuildDir
= FileName::fromUtf8(CMakeConfigItem::valueOf("CMAKE_HOME_DIRECTORY", m_cmakeCache));
= FileName::fromUtf8(CMakeConfigItem::valueOf("CMAKE_HOME_DIRECTORY", result));
const FileName canonicalSourceOfBuildDir = FileUtils::canonicalPath(sourceOfBuildDir);
const FileName canonicalSourceDirectory = FileUtils::canonicalPath(m_parameters.sourceDirectory);
if (canonicalSourceOfBuildDir != canonicalSourceDirectory) { // Uses case-insensitive compare where appropriate