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 dd6dc19ce99a880ea78e3b78f9dfca3dc806c4d4 (commit) via 5d6501821f3a1553f61a89946be35507fdc533aa (commit) from f9de1bda8571bd21f3527f31b80932603bc8e660 (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=dd6dc19ce99a880ea78e3b78f9dfca3dc806c4d4 commit dd6dc19ce99a880ea78e3b78f9dfca3dc806c4d4 Merge: f9de1bd 5d65018 Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Mon Jan 20 14:11:27 2014 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon Jan 20 14:11:27 2014 -0500 Merge topic 'osx-rpath-link-dirs' into next 5d650182 Revert "OSX: Do not add link directories to rpaths." http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d6501821f3a1553f61a89946be35507fdc533aa commit 5d6501821f3a1553f61a89946be35507fdc533aa Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Mon Jan 20 12:10:19 2014 -0700 Commit: Clinton Stimpson <clin...@elemtech.com> CommitDate: Mon Jan 20 12:10:19 2014 -0700 Revert "OSX: Do not add link directories to rpaths." This reverts commit b9e8ff4db864bfc7e5c751e6fe2b5a4478223f49. diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index 34335d2..6986965 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -375,11 +375,8 @@ cmComputeLinkInformation // Add the search path entries requested by the user to path ordering. this->OrderLinkerSearchPath ->AddUserDirectories(this->Target->GetLinkDirectories()); - if(!this->Makefile->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME")) - { - this->OrderRuntimeSearchPath - ->AddUserDirectories(this->Target->GetLinkDirectories()); - } + this->OrderRuntimeSearchPath + ->AddUserDirectories(this->Target->GetLinkDirectories()); // Set up the implicit link directories. this->LoadImplicitLinkInfo(); ----------------------------------------------------------------------- Summary of changes: Source/cmComputeLinkInformation.cxx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits