[Cmake-commits] CMake branch, next, updated. v2.8.9-1198-g52f669a

[Alexander Neundorf]

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  52f669adb298c1584871e2de61e5dc5faef9e8d5 (commit)
       via  f7abffa7fcde060f3c3fb519090678649ae89dc4 (commit)
      from  1b3376d80ae926e4f4a6e03acd15be6c8f38aa4d (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=52f669adb298c1584871e2de61e5dc5faef9e8d5
commit 52f669adb298c1584871e2de61e5dc5faef9e8d5
Merge: 1b3376d f7abffa
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Wed Oct 24 13:48:56 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 24 13:48:56 2012 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7abffa7fcde060f3c3fb519090678649ae89dc4
commit f7abffa7fcde060f3c3fb519090678649ae89dc4
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Oct 23 22:38:33 2012 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Wed Oct 24 15:26:19 2012 +0200

    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://public.kitware.com/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://public.kitware.com/Bug/view.php?id=13596 this
    makes the indexer behave better.
    
    Alex

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 689f213..09924e0 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -579,7 +579,9 @@ 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).
+      //this->SrcLinkedResources.push_back(it->first);
       }
     }
 }
@@ -730,15 +732,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 +758,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
       excludeFromOut += this->EscapeForXML(*it) + "/|";
       }
     }
-#endif
+
   excludeFromOut += "**/CMakeFiles/";
   fout << "<pathentry excluding=\"" << excludeFromOut
        << "\" kind=\"out\" path=\"\"/>\n";

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

Summary of changes:
 Source/cmExtraEclipseCDT4Generator.cxx |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake