[Cmake-commits] CMake branch, next, updated. v3.7.0-1311-g5b04ef2

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  5b04ef2a793c50b18e258c2236778fd0ae9f1d2c (commit)
       via  f84a3acd71d4aacd2c553279ab0943d09d83eced (commit)
      from  a90b109787bd7e62dd478149992fea0a3bb00b5c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b04ef2a793c50b18e258c2236778fd0ae9f1d2c
commit 5b04ef2a793c50b18e258c2236778fd0ae9f1d2c
Merge: a90b109 f84a3ac
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 21 15:06:13 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 21 15:06:13 2016 -0500

    Merge topic 'eclipse-subprojects' into next
    
    f84a3acd Eclipse: Fix indexer for subprojects


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f84a3acd71d4aacd2c553279ab0943d09d83eced
commit f84a3acd71d4aacd2c553279ab0943d09d83eced
Author:     Adam Weisi <android.weisi at googlemail.com>
AuthorDate: Mon Nov 21 15:43:37 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 21 15:05:14 2016 -0500

    Eclipse: Fix indexer for subprojects
    
    Using `add_subdirectory(source_dir binary_dir)` with `source_dir` not a
    subdirectory needs to add a `[Subprojects]` entry to the source path in
    Eclipse.  The Eclipse indexer seems to use those entries as reference to
    index source files.
    
    Closes: #15984

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index ff2703e..b4fc771 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -703,6 +703,14 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
    * Also on the cdt-dev list didn't bring any information:
    * http://web.archiveorange.com/archive/v/B4NlJDNIpYoOS1SbxFNy
    * Alex */
+  // include subprojects directory to the src pathentry
+  // eclipse cdt indexer uses this entries as reference to index source files
+  if (this->GenerateLinkedResources) {
+    xml.StartElement("pathentry");
+    xml.Attribute("kind", "src");
+    xml.Attribute("path", "[Subprojects]");
+    xml.EndElement();
+  }
 
   for (std::vector<std::string>::const_iterator it =
          this->SrcLinkedResources.begin();

-----------------------------------------------------------------------

Summary of changes:
 Source/cmExtraEclipseCDT4Generator.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)


hooks/post-receive
-- 
CMake