From 3da99f783296f32051b36e12b4d17bba76db4cb4 Mon Sep 17 00:00:00 2001
From: Cristian Adam <cristian.adam@qt.io>
Date: Tue, 30 Mar 2021 17:56:02 +0200
Subject: [PATCH] CMakePM: Filter out utility targets from target configuration
 list

In the build target list there is no reason to have <target>_autogen
or <target>_autogen_timestamps targets.

Also do not sort the target list, so that the special targets stay
at top (all, clean, install etc)

Change-Id: I3107150bb40d68cc95246d4d09abc300a6e3d3fc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/cmakeprojectmanager/cmakebuildstep.cpp   | 2 --
 src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp | 6 +++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
index 5ac0e381676..90b7bd7db06 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
@@ -532,8 +532,6 @@ void CMakeBuildStep::recreateBuildTargetsModel()
         if (idx != -1)
             m_buildTargets[idx] = QString("INSTALL");
     }
-
-    targetList.sort();
     targetList.removeDuplicates();
 
     addItem(QString(), true);
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
index 87a552a2c7f..a94bd9cc1ba 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
@@ -1051,7 +1051,11 @@ const QList<BuildTargetInfo> CMakeBuildSystem::appTargets() const
 
 QStringList CMakeBuildSystem::buildTargetTitles() const
 {
-    return transform(m_buildTargets, &CMakeBuildTarget::title);
+    auto nonUtilityTargets = filtered(m_buildTargets, [this](const CMakeBuildTarget &target){
+        return target.targetType != UtilityType ||
+               CMakeBuildStep::specialTargets(usesAllCapsTargets()).contains(target.title);
+    });
+    return transform(nonUtilityTargets, &CMakeBuildTarget::title);
 }
 
 const QList<CMakeBuildTarget> &CMakeBuildSystem::buildTargets() const