[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7175-g3117b63

[Clinton Stimpson]

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  3117b63ec9e99505477285c59f84146b5fb8cbc1 (commit)
       via  b9e8ff4db864bfc7e5c751e6fe2b5a4478223f49 (commit)
       via  434fe2baa2acb47605b2354f0c5e5a9513930b05 (commit)
      from  d2be1570409c4ad067ce63a8a34d2b2a54fb717f (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=3117b63ec9e99505477285c59f84146b5fb8cbc1
commit 3117b63ec9e99505477285c59f84146b5fb8cbc1
Merge: d2be157 b9e8ff4
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Sat Jan 18 15:11:55 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jan 18 15:11:55 2014 -0500

    Merge topic 'osx-rpath-link-dirs' into next
    
    b9e8ff4d OSX: Do not add link directories to rpaths.
    434fe2ba CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b9e8ff4db864bfc7e5c751e6fe2b5a4478223f49
commit b9e8ff4db864bfc7e5c751e6fe2b5a4478223f49
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Sat Jan 18 13:01:14 2014 -0700
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Sat Jan 18 13:07:00 2014 -0700

    OSX: Do not add link directories to rpaths.
    
    On Mac OS X, which rpaths to add to a target should be derived from dependent
    targets that have an install name using @rpath.  This can be derived if
    CMake is given the full path to the library.
    Because we need to be restrictive, do not add rpaths for directories
    given with link_directories().

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 6986965..34335d2 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -375,8 +375,11 @@ cmComputeLinkInformation
   // Add the search path entries requested by the user to path ordering.
   this->OrderLinkerSearchPath
     ->AddUserDirectories(this->Target->GetLinkDirectories());
-  this->OrderRuntimeSearchPath
-    ->AddUserDirectories(this->Target->GetLinkDirectories());
+  if(!this->Makefile->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME"))
+    {
+    this->OrderRuntimeSearchPath
+      ->AddUserDirectories(this->Target->GetLinkDirectories());
+    }
 
   // Set up the implicit link directories.
   this->LoadImplicitLinkInfo();

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

Summary of changes:
 Source/CMakeVersion.cmake           |    2 +-
 Source/cmComputeLinkInformation.cxx |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake