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

Fix problem when canceling cmake build configuration wizard.

Browse Source
This commit is contained in:
con
2009-09-30 12:19:22 +02:00
parent 92b905a6f2
commit 4c199a3ca0
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -104,11 +104,6 @@ bool CMakeBuildConfigurationFactory::create(const QString &type) const
if (!ok || buildConfigurationName.isEmpty())
return false;
BuildConfiguration *bc = new BuildConfiguration(buildConfigurationName);
m_project->addBuildConfiguration(bc);
// Default to all
if (m_project->targets().contains("all"))
m_project->makeStep()->setBuildTarget(buildConfigurationName, "all", true);
CMakeOpenProjectWizard copw(m_project->projectManager(),
m_project->sourceDirectory(),
@@ -118,6 +113,10 @@ bool CMakeBuildConfigurationFactory::create(const QString &type) const
delete bc;
return false;
}
m_project->addBuildConfiguration(bc); // this also makes the name unique
// Default to all
if (m_project->targets().contains("all"))
m_project->makeStep()->setBuildTarget(buildConfigurationName, "all", true);
bc->setValue("buildDirectory", copw.buildDirectory());
bc->setValue("msvcVersion", copw.msvcVersion());
m_project->parseCMakeLists();