forked from qt-creator/qt-creator
CMakePM: Fix build steps setup for multi-config CMake Presets
If "configuration" is set for a build preset, make sure to enable it for the corresponding CMake build configuration. Fixes: QTCREATORBUG-31554 Change-Id: I320b03a8e015e4208f04e54bf7fa73757050c12b Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
@@ -2007,14 +2007,16 @@ void CMakeBuildConfiguration::setBuildPresetToBuildSteps(const ProjectExplorer::
|
|||||||
cbs->setToolArguments(nativeToolOptions.split(" "));
|
cbs->setToolArguments(nativeToolOptions.split(" "));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (buildPresets[i].configuration)
|
if (buildPresets[i].configuration) {
|
||||||
cbs->setConfiguration(*buildPresets[i].configuration);
|
cbs->setConfiguration(*buildPresets[i].configuration);
|
||||||
|
cbs->setStepEnabled(buildTypeAspect() == buildPresets[i].configuration);
|
||||||
|
} else {
|
||||||
// Leave only the first build step enabled
|
// Leave only the first build step enabled
|
||||||
if (i > 0)
|
if (i > 0)
|
||||||
cbs->setStepEnabled(false);
|
cbs->setStepEnabled(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\class CMakeBuildConfigurationFactory
|
\class CMakeBuildConfigurationFactory
|
||||||
|
Reference in New Issue
Block a user