forked from qt-creator/qt-creator
Fixes: Add install target and don't create runconfigurations for targets without executable.
Details: One step at a time.
This commit is contained in:
@@ -320,6 +320,8 @@ void CMakeProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader
|
|||||||
qDebug()<<"Create run configurations of m_targets";
|
qDebug()<<"Create run configurations of m_targets";
|
||||||
bool setActive = false;
|
bool setActive = false;
|
||||||
foreach(const CMakeTarget &ct, m_targets) {
|
foreach(const CMakeTarget &ct, m_targets) {
|
||||||
|
if (ct.executable.isEmpty())
|
||||||
|
continue;
|
||||||
QSharedPointer<ProjectExplorer::RunConfiguration> rc(new CMakeRunConfiguration(this, ct.executable, ct.workingDirectory));
|
QSharedPointer<ProjectExplorer::RunConfiguration> rc(new CMakeRunConfiguration(this, ct.executable, ct.workingDirectory));
|
||||||
addRunConfiguration(rc);
|
addRunConfiguration(rc);
|
||||||
// The first one gets the honour of beeing the active one
|
// The first one gets the honour of beeing the active one
|
||||||
@@ -501,7 +503,7 @@ void CMakeCbpParser::parseTarget()
|
|||||||
while (!atEnd()) {
|
while (!atEnd()) {
|
||||||
readNext();
|
readNext();
|
||||||
if (isEndElement()) {
|
if (isEndElement()) {
|
||||||
if (m_targetType || m_target.title == "all") {
|
if (m_targetType || m_target.title == "all" || m_target.title == "install") {
|
||||||
m_targets.append(m_target);
|
m_targets.append(m_target);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
|
|||||||
Reference in New Issue
Block a user