[Cmake-commits] CMake branch, next, updated. v2.8.8-3615-gf607c0f

[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  f607c0f7d5e1db6b5b2433f36ab0814334ee04cb (commit)
       via  4ea5dc5ba5d9e73d013d3a1166d321a8433a3384 (commit)
      from  05e94e90f78aba45c6f9acaa900bfed9d0b7c77a (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=f607c0f7d5e1db6b5b2433f36ab0814334ee04cb
commit f607c0f7d5e1db6b5b2433f36ab0814334ee04cb
Merge: 05e94e9 4ea5dc5
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Fri Aug 3 16:03:16 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 3 16:03:16 2012 -0400

    Merge topic 'EclipseFixBadLinkedResources' into next
    
    4ea5dc5 Eclipse: fix #13358: don't create bad linked resources


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ea5dc5ba5d9e73d013d3a1166d321a8433a3384
commit 4ea5dc5ba5d9e73d013d3a1166d321a8433a3384
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Sat Jul 28 18:42:47 2012 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Sat Jul 28 18:42:47 2012 +0200

    Eclipse: fix #13358: don't create bad linked resources
    
    Don't create linked resources which point to CMAKE_BINARY_DIR
    itself or one of its parent dirs. Eclipse complained about that.
    
    Alex

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 78a8704..5c7d400 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -1334,12 +1334,26 @@ bool cmExtraEclipseCDT4Generator
     {
     outputPath = this->HomeOutputDirectory + "/" + outputPath;
     }
+
+  // in this case it's not necessary:
   if (cmSystemTools::IsSubDirectory(outputPath.c_str(),
                                     this->HomeOutputDirectory.c_str()))
     {
     return false;
     }
 
+  // in these two cases Eclipse would complain:
+  if (cmSystemTools::IsSubDirectory(this->HomeOutputDirectory.c_str(),
+                                    outputPath.c_str()))
+    {
+    return false;
+    }
+  if (cmSystemTools::GetRealPath(outputPath.c_str())
+              == cmSystemTools::GetRealPath(this->HomeOutputDirectory.c_str()))
+    {
+    return false;
+    }
+
   std::string name = this->GetPathBasename(outputPath);
 
   // make sure linked resource name is unique

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

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


hooks/post-receive
-- 
CMake