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

CMake: Do not store kit cmake configuration in BuildConfiguration

Browse Source 
Change-Id: Ia45c03f42083af0871b12351c98092a2e7887158
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-05-13 11:53:25 +02:00
parent 0d262e3a6b
commit f6bf3344d6
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -265,7 +265,6 @@ void CMakeBuildConfiguration::setCurrentCMakeConfiguration(const QList<ConfigMod
return ni; return ni;
}); });
// There is a buildDirManager, so there must also be an active BC:
const CMakeConfig config = cmakeConfiguration() + newConfig; const CMakeConfig config = cmakeConfiguration() + newConfig;
setCMakeConfiguration(config); setCMakeConfiguration(config);
@@ -316,7 +315,8 @@ void CMakeBuildConfiguration::setCMakeConfiguration(const CMakeConfig &config)
CMakeConfig CMakeBuildConfiguration::cmakeConfiguration() const CMakeConfig CMakeBuildConfiguration::cmakeConfiguration() const
{ {
return m_configuration; return removeDuplicates(CMakeConfigurationKitInformation::configuration(target()->kit())
+ m_configuration);
} }
void CMakeBuildConfiguration::setError(const QString &message) void CMakeBuildConfiguration::setError(const QString &message)
@@ -497,7 +497,6 @@ CMakeBuildInfo *CMakeBuildConfigurationFactory::createBuildInfo(const ProjectExp
auto info = new CMakeBuildInfo(this); auto info = new CMakeBuildInfo(this);
info->kitId = k->id(); info->kitId = k->id();
info->sourceDirectory = sourceDir; info->sourceDirectory = sourceDir;
info->configuration = CMakeConfigurationKitInformation::configuration(k);
CMakeConfigItem buildTypeItem; CMakeConfigItem buildTypeItem;
switch (buildType) { switch (buildType) {