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

CMake: Add helper method to find the default build target for a BuildStep

Browse Source 
Add a helper method to find the default build target for a CMakeBuildStep
based on the BuildStepList the step is part of. Use all/install/clean
targets as appropriate.

Change-Id: Idc0c5fae7dfd255039b87ace77c02688cdd76e8f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2019-07-23 13:05:07 +02:00
parent 29df009cef
commit 8b9821440d
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
View File

@@ -91,14 +91,8 @@ CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl) :
} }
// Set a good default build target: // Set a good default build target:
if (m_buildTarget.isEmpty()) { if (m_buildTarget.isEmpty())
if (bsl->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) setBuildTarget(defaultBuildTarget());
setBuildTarget(cleanTarget());
else if (bsl->id() == ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
setBuildTarget(installTarget());
else
setBuildTarget(allTarget());
}
connect(target(), &Target::kitChanged, this, &CMakeBuildStep::cmakeCommandChanged); connect(target(), &Target::kitChanged, this, &CMakeBuildStep::cmakeCommandChanged);
connect(project(), &Project::parsingFinished, connect(project(), &Project::parsingFinished,
@@ -277,6 +271,17 @@ BuildStepConfigWidget *CMakeBuildStep::createConfigWidget()
return new CMakeBuildStepConfigWidget(this); return new CMakeBuildStepConfigWidget(this);
} }
QString CMakeBuildStep::defaultBuildTarget() const
{
const ProjectConfiguration *const pc = qobject_cast<ProjectConfiguration *>(parent());
const Core::Id parentId = pc ? pc->id() : Core::Id();
if (parentId == ProjectExplorer::Constants::BUILDSTEPS_CLEAN)
return cleanTarget();
if (parentId == ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
return installTarget();
return allTarget();
}
void CMakeBuildStep::stdOutput(const QString &line) void CMakeBuildStep::stdOutput(const QString &line)
{ {
if (m_percentProgress.indexIn(line) != -1) { if (m_percentProgress.indexIn(line) != -1) {

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

@@ -98,6 +98,8 @@ private:
void doRun() override; void doRun() override;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
QString defaultBuildTarget() const;
void runImpl(); void runImpl();
void handleProjectWasParsed(bool success); void handleProjectWasParsed(bool success);