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

CMake: Store CMake project configuration in CMakeBuildConfiguration

Browse Source 
Store CMakeConfig in CMakeBuildConfiguration instead of the list of
initialArguments.

Update initialArguments to a list of settings on load.

Change-Id: If58fc38296a4627f40062dd407e684c8a9477f6e
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-02-03 13:52:50 +01:00
parent 28e4306865
commit 744008ccf0
4 changed files with 82 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
View File

@@ -25,6 +25,8 @@
#pragma once
#include "cmakeconfigitem.h"
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/abi.h>
@@ -54,8 +56,8 @@ public:
void emitBuildTypeChanged();
void setInitialArguments(const QString &arguments);
QString initialArguments() const;
void setCMakeConfiguration(const CMakeConfig &config);
CMakeConfig cmakeConfiguration() const;
protected:
CMakeBuildConfiguration(ProjectExplorer::Target *parent, CMakeBuildConfiguration *source);
@@ -63,6 +65,7 @@ protected:
private:
QString m_initialArguments;
CMakeConfig m_configuration;
friend class CMakeProjectManager::CMakeProject;
};