From f88ad0ce424432325affcab8bd2f620c39243d95 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Wed, 19 Nov 2014 18:33:04 +0100 Subject: [PATCH] CMake: Fine tune finding a suitable targets for files Ignore targets that have no include directories, those are in general not targets that are very useful. Change-Id: I1cd1f7dffc73eace2f7a0897bc15dea7e6bc5fee Reviewed-by: Tobias Hunger --- src/plugins/cmakeprojectmanager/cmakeproject.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index bf671f5136a..a2ec61245fe 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -874,6 +874,8 @@ void CMakeCbpParser::sortFiles() int bestIncludeCount = -1; for (int i = 0; i < m_buildTargets.size(); ++i) { const CMakeBuildTarget &target = m_buildTargets.at(i); + if (target.includeFiles.isEmpty()) + continue; if (target.sourceDirectory == m_sourceDirectory && target.includeFiles.count() > bestIncludeCount) { bestIncludeCount = target.includeFiles.count(); @@ -893,6 +895,8 @@ void CMakeCbpParser::sortFiles() for (int i = 0; i < m_buildTargets.size(); ++i) { const CMakeBuildTarget &target = m_buildTargets.at(i); + if (target.includeFiles.isEmpty()) + continue; if (fileName.isChildOf(Utils::FileName::fromString(target.sourceDirectory)) && (target.sourceDirectory.size() > bestLength || (target.sourceDirectory.size() == bestLength &&