From e42f3db9f0ab1ec28bf9ba414add84d3b552118f Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 20 Jun 2017 12:21:24 +0200 Subject: CMake: Avoid duplicate build targets Make sure that build targets that get added explicitly are never reported by any of the readers, too. This makes sure entries will not show up twice in the UI. Task-number: QTCREATORBUG-18409 Change-Id: Id5039add262211fd87cd5c2884df2af0fcf24577 Reviewed-by: Tim Jenssen --- src/plugins/cmakeprojectmanager/builddirmanager.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/plugins/cmakeprojectmanager/builddirmanager.cpp b/src/plugins/cmakeprojectmanager/builddirmanager.cpp index ca2fd4bd6a9..d474c95cabb 100644 --- a/src/plugins/cmakeprojectmanager/builddirmanager.cpp +++ b/src/plugins/cmakeprojectmanager/builddirmanager.cpp @@ -336,7 +336,12 @@ QList BuildDirManager::buildTargets() const m_buildTargets.append(utilityTarget(CMakeBuildStep::installTarget(), this)); m_buildTargets.append(utilityTarget(CMakeBuildStep::testTarget(), this)); - m_buildTargets.append(m_reader->buildTargets()); + m_buildTargets.append(Utils::filtered(m_reader->buildTargets(), [](const CMakeBuildTarget &bt) { + return bt.title == CMakeBuildStep::allTarget() + || bt.title == CMakeBuildStep::cleanTarget() + || bt.title == CMakeBuildStep::installTarget() + || bt.title == CMakeBuildStep::testTarget(); + })); } return m_buildTargets; } -- cgit v1.2.3