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

CMakeProject: Fix useNinja handling in MakeStep

Browse Source 
m_useNinja is now only used to store the value at init() time, thus
it's only use is to know while running, whether ninja is in use.

Otherwise whether ninja is used or not, is stored in the
buildconfiguration.

Change-Id: Icda933807ac2f8e5fad32fd124a37bb694bf6e97
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2014-04-03 16:33:04 +02:00
parent d5f2dc0df4
commit ebb38289e8
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/cmakeprojectmanager/makestep.cpp
View File

@@ -96,14 +96,12 @@ void MakeStep::ctor()
CMakeBuildConfiguration *bc = cmakeBuildConfiguration(); CMakeBuildConfiguration *bc = cmakeBuildConfiguration();
if (bc) { if (bc) {
m_useNinja = bc->useNinja();
m_activeConfiguration = 0; m_activeConfiguration = 0;
connect(bc, SIGNAL(useNinjaChanged(bool)), this, SLOT(setUseNinja(bool))); connect(bc, SIGNAL(useNinjaChanged(bool)), this, SLOT(setUseNinja()));
} else { } else {
// That means the step is in the deploylist, so we listen to the active build config // That means the step is in the deploylist, so we listen to the active build config
// changed signal and react to the activeBuildConfigurationChanged() signal of the buildconfiguration // changed signal and react to the activeBuildConfigurationChanged() signal of the buildconfiguration
m_activeConfiguration = targetsActiveBuildConfiguration(); m_activeConfiguration = targetsActiveBuildConfiguration();
m_useNinja = m_activeConfiguration->useNinja();
connect (target(), SIGNAL(activeBuildConfigurationChanged(ProjectExplorer::BuildConfiguration*)), connect (target(), SIGNAL(activeBuildConfigurationChanged(ProjectExplorer::BuildConfiguration*)),
this, SLOT(activeBuildConfigurationChanged())); this, SLOT(activeBuildConfigurationChanged()));
activeBuildConfigurationChanged(); activeBuildConfigurationChanged();
@@ -134,10 +132,10 @@ void MakeStep::activeBuildConfigurationChanged()
m_activeConfiguration = targetsActiveBuildConfiguration(); m_activeConfiguration = targetsActiveBuildConfiguration();
if (m_activeConfiguration) { if (m_activeConfiguration)
connect(m_activeConfiguration, SIGNAL(useNinjaChanged(bool)), this, SLOT(setUseNinja(bool))); connect(m_activeConfiguration, SIGNAL(useNinjaChanged(bool)), this, SLOT(setUseNinja(bool)));
setUseNinja(m_activeConfiguration->useNinja());
} emit makeCommandChanged();
} }
void MakeStep::buildTargetsChanged() void MakeStep::buildTargetsChanged()
@@ -161,7 +159,6 @@ QVariantMap MakeStep::toMap() const
map.insert(QLatin1String(CLEAN_KEY), m_clean); map.insert(QLatin1String(CLEAN_KEY), m_clean);
map.insert(QLatin1String(BUILD_TARGETS_KEY), m_buildTargets); map.insert(QLatin1String(BUILD_TARGETS_KEY), m_buildTargets);
map.insert(QLatin1String(ADDITIONAL_ARGUMENTS_KEY), m_additionalArguments); map.insert(QLatin1String(ADDITIONAL_ARGUMENTS_KEY), m_additionalArguments);
map.insert(QLatin1String(USE_NINJA_KEY), m_useNinja);
return map; return map;
} }
@@ -170,7 +167,6 @@ bool MakeStep::fromMap(const QVariantMap &map)
m_clean = map.value(QLatin1String(CLEAN_KEY)).toBool(); m_clean = map.value(QLatin1String(CLEAN_KEY)).toBool();
m_buildTargets = map.value(QLatin1String(BUILD_TARGETS_KEY)).toStringList(); m_buildTargets = map.value(QLatin1String(BUILD_TARGETS_KEY)).toStringList();
m_additionalArguments = map.value(QLatin1String(ADDITIONAL_ARGUMENTS_KEY)).toString(); m_additionalArguments = map.value(QLatin1String(ADDITIONAL_ARGUMENTS_KEY)).toString();
m_useNinja = map.value(QLatin1String(USE_NINJA_KEY)).toBool();
return BuildStep::fromMap(map); return BuildStep::fromMap(map);
} }
@@ -200,6 +196,8 @@ bool MakeStep::init()
return false; return false;
} }
m_useNinja = bc->useNinja();
QString arguments = Utils::QtcProcess::joinArgs(m_buildTargets); QString arguments = Utils::QtcProcess::joinArgs(m_buildTargets);
Utils::QtcProcess::addArgs(&arguments, additionalArguments()); Utils::QtcProcess::addArgs(&arguments, additionalArguments());
@@ -312,20 +310,21 @@ void MakeStep::setAdditionalArguments(const QString &list)
QString MakeStep::makeCommand(ProjectExplorer::ToolChain *tc, const Utils::Environment &env) const QString MakeStep::makeCommand(ProjectExplorer::ToolChain *tc, const Utils::Environment &env) const
{ {
if (m_useNinja) CMakeBuildConfiguration *bc = cmakeBuildConfiguration();
if (!bc)
bc = targetsActiveBuildConfiguration();
if (bc && bc->useNinja())
return QLatin1String("ninja"); return QLatin1String("ninja");
if (tc) if (tc)
return tc->makeCommand(env); return tc->makeCommand(env);
return QLatin1String("make"); return QLatin1String("make");
} }
void MakeStep::setUseNinja(bool useNinja) void MakeStep::setUseNinja()
{ {
if (m_useNinja != useNinja) { emit makeCommandChanged();
m_useNinja = useNinja;
emit makeCommandChanged();
}
} }
// //

2
src/plugins/cmakeprojectmanager/makestep.h
View File

@@ -80,7 +80,7 @@ public:
QVariantMap toMap() const; QVariantMap toMap() const;
public slots: public slots:
void setUseNinja(bool); void setUseNinja();
void activeBuildConfigurationChanged(); void activeBuildConfigurationChanged();
private slots: private slots: