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

CMake: Save all files before running cmake wizard

Browse Source 
Task-number: QTCREATORBUG-9537

Change-Id: Ie5e4ffd33a9a9108c2e12bf8e71d932f6586053c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2013-06-18 17:54:11 +02:00
parent f7349e49df
commit af254e47aa
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1011,6 +1011,8 @@ void CMakeBuildSettingsWidget::openChangeBuildDirectoryDialog()
void CMakeBuildSettingsWidget::runCMake() void CMakeBuildSettingsWidget::runCMake()
{ {
if (!ProjectExplorer::ProjectExplorerPlugin::instance()->saveModifiedFiles())
return;
CMakeProject *project = static_cast<CMakeProject *>(m_buildConfiguration->target()->project()); CMakeProject *project = static_cast<CMakeProject *>(m_buildConfiguration->target()->project());
CMakeOpenProjectWizard copw(project->projectManager(), CMakeOpenProjectWizard copw(project->projectManager(),
CMakeOpenProjectWizard::WantToUpdate, CMakeOpenProjectWizard::WantToUpdate,

3
src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
View File

@@ -115,6 +115,9 @@ void CMakeManager::runCMake(ProjectExplorer::Project *project)
if (!cmakeProject || !cmakeProject->activeTarget() || !cmakeProject->activeTarget()->activeBuildConfiguration()) if (!cmakeProject || !cmakeProject->activeTarget() || !cmakeProject->activeTarget()->activeBuildConfiguration())
return; return;
if (!ProjectExplorer::ProjectExplorerPlugin::instance()->saveModifiedFiles())
return;
CMakeBuildConfiguration *bc CMakeBuildConfiguration *bc
= static_cast<CMakeBuildConfiguration *>(cmakeProject->activeTarget()->activeBuildConfiguration()); = static_cast<CMakeBuildConfiguration *>(cmakeProject->activeTarget()->activeBuildConfiguration());