[Cmake-commits] CMake branch, next, updated. v3.0.1-5265-g6b422b6

[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  6b422b6bbd126611469a085b5bc9a5956669b6a9 (commit)
       via  f99cc9c389189f4137ca578a5abb1556bfb733d3 (commit)
      from  5c6635d90de331677ae75f436d82239e1496998b (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=6b422b6bbd126611469a085b5bc9a5956669b6a9
commit 6b422b6bbd126611469a085b5bc9a5956669b6a9
Merge: 5c6635d f99cc9c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 9 15:28:18 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 9 15:28:18 2014 -0400

    Merge topic 'tolerate-lib-dir-symlink' into next
    
    f99cc9c3 Tolerate symlinks during RPATH ordering (#13429)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f99cc9c389189f4137ca578a5abb1556bfb733d3
commit f99cc9c389189f4137ca578a5abb1556bfb733d3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 9 08:57:20 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 9 09:01:59 2014 -0400

    Tolerate symlinks during RPATH ordering (#13429)
    
    On Arch Linux, /lib and /lib64 are symlinks to /usr/lib.  When ordering
    runtime library search paths, we must not consider these to be distinct
    directories.  Before considering conflicts between two directories,
    check that they do not have the same 'realpath'.
    
    Inspired-by: Myles English <mylesenglish at gmail.com>

diff --git a/Source/cmOrderDirectories.cxx b/Source/cmOrderDirectories.cxx
index 71a3497..007364c 100644
--- a/Source/cmOrderDirectories.cxx
+++ b/Source/cmOrderDirectories.cxx
@@ -72,7 +72,10 @@ public:
       {
       // Check if this directory conflicts with the entry.
       std::string const& dir = this->OD->OriginalDirectories[i];
-      if(dir != this->Directory && this->FindConflict(dir))
+      if(dir != this->Directory &&
+         cmSystemTools::GetRealPath(dir) !=
+         cmSystemTools::GetRealPath(this->Directory) &&
+         this->FindConflict(dir))
         {
         // The library will be found in this directory but this is not
         // the directory named for it.  Add an entry to make sure the
@@ -90,7 +93,10 @@ public:
       {
       // Check if this directory conflicts with the entry.
       std::string const& dir = this->OD->OriginalDirectories[i];
-      if(dir != this->Directory && this->FindConflict(dir))
+      if(dir != this->Directory &&
+         cmSystemTools::GetRealPath(dir) !=
+         cmSystemTools::GetRealPath(this->Directory) &&
+         this->FindConflict(dir))
         {
         // The library will be found in this directory but it is
         // supposed to be found in an implicit search directory.

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

Summary of changes:
 Source/cmOrderDirectories.cxx |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake