[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-917-g909239e

[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  909239eba626468e8842303a06f2b12c19606a59 (commit)
       via  a672b16a3a528d6dbfcba7758a798eeb87bd57ee (commit)
      from  f14b78139f872d702d2198a4d137cb40cf3fde78 (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=909239eba626468e8842303a06f2b12c19606a59
commit 909239eba626468e8842303a06f2b12c19606a59
Merge: f14b781 a672b16
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 8 14:31:25 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 8 14:31:25 2015 -0400

    Merge topic 'eclipse-cygwin-paths' into next
    
    a672b16a Eclipse: Fix paths in target links on cygwin


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a672b16a3a528d6dbfcba7758a798eeb87bd57ee
commit a672b16a3a528d6dbfcba7758a798eeb87bd57ee
Author:     Markus Grech <markus.grech at gmail.com>
AuthorDate: Wed Jul 8 18:20:58 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 8 14:29:11 2015 -0400

    Eclipse: Fix paths in target links on cygwin
    
    Add a missing GetEclipsePath call to fix generation of incorrect paths
    for target links in Eclipse CDT generator which caused Eclipse to be
    unable to open files through such links.  Without this the generator
    would generate invalid links for source files under "[Targets]", making
    Eclipse unable to open them.  The old links looked like
    "C:/cygdrive/c/...", while new links correctly are "C:/...".

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index a81e53c..44bf586 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -598,7 +598,8 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(
                 linkName4 += "/";
                 linkName4 += cmSystemTools::GetFilenameName(fullPath);
                 this->AppendLinkedResource(fout, linkName4,
-                                           fullPath, LinkToFile);
+                                           this->GetEclipsePath(fullPath),
+                                           LinkToFile);
                 }
               }
             }

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

Summary of changes:
 Source/cmExtraEclipseCDT4Generator.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake