From a2a2a20944a9f6f53ce9619e33988e9bc2e11d45 Mon Sep 17 00:00:00 2001
Message-Id: <a2a2a20944a9f6f53ce9619e33988e9bc2e11d45.1463408675.git.brad.king@kitware.com>
From: Alex Neundorf <neundorf@kde.org>
Date: Wed, 20 Apr 2016 22:40:00 +0200
Subject: [PATCH] Eclipse: add links to subdirs which are not subdirs of
 CMAKE_SOURCE_DIR

This should fix #15347.
This patch adds src path entries to the .cproject file for
subdirs which are not subdirs of CMAKE_SOURCE_DIR,
otherwise the Eclipse indexer doesn't index those files.

Alex
---
 Source/cmExtraEclipseCDT4Generator.cxx | 14 +++++++++++---
 Source/cmExtraEclipseCDT4Generator.h   |  3 ++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 9e67301..82d84f6 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -202,7 +202,8 @@ void cmExtraEclipseCDT4Generator::CreateSourceProjectFile()
 
   if (this->SupportsVirtualFolders)
     {
-    this->CreateLinksToSubprojects(xml, this->HomeDirectory);
+    this->CreateLinksToSubprojects(xml, this->HomeDirectory,
+                                   this->HomeDirectory);
     this->SrcLinkedResources.clear();
     }
 
@@ -458,7 +459,8 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
 
   if (this->SupportsVirtualFolders)
     {
-    this->CreateLinksToSubprojects(xml, this->HomeOutputDirectory);
+    this->CreateLinksToSubprojects(xml, this->HomeOutputDirectory,
+                                   this->HomeDirectory);
 
     this->CreateLinksForTargets(xml);
     }
@@ -580,7 +582,8 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(cmXMLWriter& xml)
 
 //----------------------------------------------------------------------------
 void cmExtraEclipseCDT4Generator::CreateLinksToSubprojects(
-                       cmXMLWriter& xml, const std::string& baseDir)
+                       cmXMLWriter& xml, const std::string& baseDir,
+                       const std::string& srcDir)
 {
   if (!this->GenerateLinkedResources)
     {
@@ -613,6 +616,11 @@ void cmExtraEclipseCDT4Generator::CreateLinksToSubprojects(
                                 );
       // Don't add it to the srcLinkedResources, because listing multiple
       // directories confuses the Eclipse indexer (#13596).
+      if ((linkSourceDirectory != srcDir) && !cmSystemTools::IsSubDirectory(linkSourceDirectory, srcDir))
+        {
+        this->SrcLinkedResources.push_back(it->first);
+        }
+
       }
     }
 }
diff --git a/Source/cmExtraEclipseCDT4Generator.h b/Source/cmExtraEclipseCDT4Generator.h
index 26955ef..06371a4 100644
--- a/Source/cmExtraEclipseCDT4Generator.h
+++ b/Source/cmExtraEclipseCDT4Generator.h
@@ -103,7 +103,8 @@ private:
 
   void WriteGroups(std::vector<cmSourceGroup> const& sourceGroups,
                    std::string& linkName, cmXMLWriter& xml);
-  void CreateLinksToSubprojects(cmXMLWriter& xml, const std::string& baseDir);
+  void CreateLinksToSubprojects(cmXMLWriter& xml, const std::string& baseDir,
+                                const std::string& srcDir);
   void CreateLinksForTargets(cmXMLWriter& xml);
 
   std::vector<std::string> SrcLinkedResources;
-- 
2.8.1