[Cmake-commits] CMake branch, next, updated. v2.8.10-772-ga3b1599

[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  a3b1599abcfa47468df65a116a5fa3494dfbd708 (commit)
       via  077de8b27136d0ac84eebdac8dd468c273b16597 (commit)
      from  30eed45510fc6cd906c2f2b6d4e093eaf23faed6 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a3b1599abcfa47468df65a116a5fa3494dfbd708
commit a3b1599abcfa47468df65a116a5fa3494dfbd708
Merge: 30eed45 077de8b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 6 11:52:54 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 6 11:52:54 2012 -0500

    Merge topic 'EclipseFixIndexerBySettingSourcePath' into next
    
    077de8b Eclipse: set source path once to fix Eclipse indexer (#13596)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=077de8b27136d0ac84eebdac8dd468c273b16597
commit 077de8b27136d0ac84eebdac8dd468c273b16597
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Oct 23 22:38:33 2012 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 6 11:51:11 2012 -0500

    Eclipse: set source path once to fix Eclipse indexer (#13596)
    
    Since CMake 2.8.7 no src-path entry was generated anymore, in response to
    
     http://www.cmake.org/Bug/view.php?id=12213
    
    Before that a src-path entry was added for each linked resource.
    Now only one src-path entry is added, for the ${CMAKE_SOURCE_DIR}.
    According to
    
     http://www.cmake.org/Bug/view.php?id=13596
    
    this makes the indexer behave better.
    
    Alex

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 689f213..c8f98d7 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -579,7 +579,8 @@ void cmExtraEclipseCDT4Generator::CreateLinksToSubprojects(
                                  this->GetEclipsePath(linkSourceDirectory),
                                  LinkToFolder
                                 );
-      this->SrcLinkedResources.push_back(it->first);
+      // Don't add it to the srcLinkedResources, because listing multiple
+      // directories confuses the Eclipse indexer (#13596).
       }
     }
 }
@@ -730,15 +731,16 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
 /* I don't know what the pathentry kind="src" are good for, e.g. autocompletion
  * works also without them. Done wrong, the indexer complains, see #12417
  * and #12213.
+ * According to #13596, this entry at least limits the directories the
+ * indexer is searching for files. So now the "src" entry contains only
+ * the linked resource to CMAKE_SOURCE_DIR.
  * The CDT documentation is very terse on that:
  * "CDT_SOURCE: Entry kind constant describing a path entry identifying a
  * folder containing source code to be compiled."
  * Also on the cdt-dev list didn't bring any information:
  * http://web.archiveorange.com/archive/v/B4NlJDNIpYoOS1SbxFNy
- * So I'm disabling them for now, hoping that somebody will report if something
- * is not workging anymore.
  * Alex */
-#ifdef DO_CREATE_SRC_PATH_ENTRIES
+
   for (std::vector<std::string>::const_iterator
        it = this->SrcLinkedResources.begin();
        it != this->SrcLinkedResources.end();
@@ -755,7 +757,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
       excludeFromOut += this->EscapeForXML(*it) + "/|";
       }
     }
-#endif
+
   excludeFromOut += "**/CMakeFiles/";
   fout << "<pathentry excluding=\"" << excludeFromOut
        << "\" kind=\"out\" path=\"\"/>\n";

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

Summary of changes:


hooks/post-receive
-- 
CMake