diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp index c816a16ce13..aa06738d04d 100644 --- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp @@ -450,11 +450,20 @@ void CMakeRunPage::initializePage() void CMakeRunPage::runCMake() { + if (m_cmakeExecutable) { + // We asked the user for the cmake executable + m_cmakeWizard->cmakeManager()->setCMakeExecutable(m_cmakeExecutable->path()); + } + int index = m_generatorComboBox->currentIndex(); ProjectExplorer::ToolChain *tc = 0; if (index >= 0) tc = static_cast(m_generatorComboBox->itemData(index).value()); + if (!tc) { + m_output->appendPlainText(tr("No generator selected.")); + return; + } m_cmakeWizard->setToolChain(tc); @@ -475,10 +484,7 @@ void CMakeRunPage::runCMake() Utils::Environment env = m_cmakeWizard->environment(); tc->addToEnvironment(env); - if (m_cmakeExecutable) { - // We asked the user for the cmake executable - m_cmakeWizard->cmakeManager()->setCMakeExecutable(m_cmakeExecutable->path()); - } + m_output->clear();