From c9208932d71eada289c47f876089168981aff20d Mon Sep 17 00:00:00 2001
From: Cristian Adam <cristian.adam@qt.io>
Date: Tue, 20 Feb 2024 13:45:48 +0100
Subject: [PATCH] CMakePM: Don't show anything but CMake Preset Kits during
 initial configure

This is for projects that use CMake Presets, and matches the expectations of the users using CMake Presets.

The user can still enable a Kit from the left list of Kits, which is not filtered.

Amends 87c67fc6d7193883edb9a0244296cd429f0473de

Task-number: QTCREATORBUG-29535
Change-Id: If97eef867a687c877b1cbd08cd4537fe6459136f
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 src/plugins/cmakeprojectmanager/cmakeproject.cpp    | 13 +++++++++++++
 .../cmakeprojectmanager/cmakeprojectimporter.cpp    |  4 +---
 .../cmakeprojectmanager/cmakeprojectimporter.h      |  1 -
 src/plugins/cmakeprojectmanager/presetsparser.h     |  1 +
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index 7318c7a791f..25352f0b5d6 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -7,6 +7,7 @@
 #include "cmakeprojectconstants.h"
 #include "cmakeprojectimporter.h"
 #include "cmakeprojectmanagertr.h"
+#include "presetsmacros.h"
 
 #include <coreplugin/icontext.h>
 #include <projectexplorer/buildconfiguration.h>
@@ -301,6 +302,18 @@ void CMakeProject::readPresets()
 
     m_presetsData = combinePresets(cmakePresetsData, cmakeUserPresetsData);
     setupBuildPresets(m_presetsData);
+
+    for (const auto &configPreset : m_presetsData.configurePresets) {
+        if (configPreset.hidden.value())
+            continue;
+
+        if (configPreset.condition) {
+            if (!CMakePresets::Macros::evaluatePresetCondition(configPreset, projectFilePath()))
+                continue;
+        }
+        m_presetsData.havePresets = true;
+        break;
+    }
 }
 
 bool CMakeProject::setupTarget(Target *t)
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
index 450d1540102..52ed82f8d77 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
@@ -201,8 +201,6 @@ FilePaths CMakeProjectImporter::presetCandidates()
         }
     }
 
-    m_hasCMakePresets = !candidates.isEmpty();
-
     return candidates;
 }
 
@@ -223,7 +221,7 @@ Target *CMakeProjectImporter::preferredTarget(const QList<Target *> &possibleTar
 
 bool CMakeProjectImporter::filter(ProjectExplorer::Kit *k) const
 {
-    if (!m_hasCMakePresets)
+    if (!m_project->presetsData().havePresets)
         return true;
 
     const auto presetConfigItem = CMakeConfigurationKitAspect::cmakePresetConfigItem(k);
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.h b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.h
index 82e1835ba7b..63c2403f4b4 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.h
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.h
@@ -49,7 +49,6 @@ private:
 
     const CMakeProject *m_project;
     Utils::TemporaryDirectory m_presetsTempDir;
-    bool m_hasCMakePresets = false;
 };
 
 #ifdef WITH_TESTS
diff --git a/src/plugins/cmakeprojectmanager/presetsparser.h b/src/plugins/cmakeprojectmanager/presetsparser.h
index 20d36e389ec..6df09014af3 100644
--- a/src/plugins/cmakeprojectmanager/presetsparser.h
+++ b/src/plugins/cmakeprojectmanager/presetsparser.h
@@ -140,6 +140,7 @@ class PresetsData
 {
 public:
     int version = 0;
+    bool havePresets = false;
     QVersionNumber cmakeMinimimRequired;
     QHash<QString, QString> vendor;
     std::optional<QStringList> include;