From 5d3b507441cbfdbc41b1b0c11a78c6273f4beaf4 Mon Sep 17 00:00:00 2001
From: Cristian Adam <cristian.adam@qt.io>
Date: Mon, 17 Feb 2025 17:22:01 +0100
Subject: [PATCH] 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>
---
 .../cmakeprojectmanager/cmakebuildconfiguration.cpp  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index 7ab76749aa0..20b87c1f8a1 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -2007,12 +2007,14 @@ void CMakeBuildConfiguration::setBuildPresetToBuildSteps(const ProjectExplorer::
             cbs->setToolArguments(nativeToolOptions.split(" "));
         }
 
-        if (buildPresets[i].configuration)
+        if (buildPresets[i].configuration) {
             cbs->setConfiguration(*buildPresets[i].configuration);
-
-        // Leave only the first build step enabled
-        if (i > 0)
-            cbs->setStepEnabled(false);
+            cbs->setStepEnabled(buildTypeAspect() == buildPresets[i].configuration);
+        } else {
+            // Leave only the first build step enabled
+            if (i > 0)
+                cbs->setStepEnabled(false);
+        }
     }
 }