[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2596-gfcd4080

[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  fcd4080c2c54db375b738a4b1080d882db12b58d (commit)
       via  22f7934a6e9c3dd350ec3ed6db91821783cd98a2 (commit)
      from  e35667fb1d2207777baf8d6027281ab8749ac800 (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=fcd4080c2c54db375b738a4b1080d882db12b58d
commit fcd4080c2c54db375b738a4b1080d882db12b58d
Merge: e35667f 22f7934
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Tue Jun 11 17:45:14 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 11 17:45:14 2013 -0400

    Merge topic 'FixEclipseCorruptProjects' into next
    
    22f7934 Eclipse: fix #14204 and #14205: no file links to directories


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=22f7934a6e9c3dd350ec3ed6db91821783cd98a2
commit 22f7934a6e9c3dd350ec3ed6db91821783cd98a2
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Jun 11 22:50:38 2013 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Jun 11 22:50:38 2013 +0200

    Eclipse: fix #14204 and #14205: no file links to directories
    
    If a source file name is empty, or if it is a directory,
    don't create a linked resource to it.
    
    Alex

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 6b02e15..d80e775 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -554,12 +554,15 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(
                 fileIt != sFiles.end();
                 ++fileIt)
               {
-              std::string linkName4 = linkName3;
-              linkName4 += "/";
-              linkName4 +=
-                      cmSystemTools::GetFilenameName((*fileIt)->GetFullPath());
-              this->AppendLinkedResource(fout, linkName4,
-                                         (*fileIt)->GetFullPath(), LinkToFile);
+              std::string fullPath = (*fileIt)->GetFullPath();
+              if (!cmSystemTools::FileIsDirectory(fullPath.c_str()))
+                {
+                std::string linkName4 = linkName3;
+                linkName4 += "/";
+                linkName4 += cmSystemTools::GetFilenameName(fullPath);
+                this->AppendLinkedResource(fout, linkName4,
+                                           fullPath, LinkToFile);
+                }
               }
             }
           }

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

Summary of changes:
 Source/cmExtraEclipseCDT4Generator.cxx |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake