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 feba0b9f7667f7307b8842fe50b50553ac4fce75 (commit)
via ff01f8b60025cca88ebcba9b83ab9492b1521c2c (commit)
from c6040dce84c5181be9090e00e9d34f8b69a8f75a (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=feba0b9f7667f7307b8842fe50b50553ac4fce75
commit feba0b9f7667f7307b8842fe50b50553ac4fce75
Merge: c6040dc ff01f8b
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Wed Jun 5 23:34:00 2013 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Jun 5 23:34:00 2013 -0400
Merge topic 'rpath-on-mac' into next
ff01f8b OS X: Improvements for getting install name of dylib.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff01f8b60025cca88ebcba9b83ab9492b1521c2c
commit ff01f8b60025cca88ebcba9b83ab9492b1521c2c
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Wed Jun 5 21:31:11 2013 -0600
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Wed Jun 5 21:31:11 2013 -0600
OS X: Improvements for getting install name of dylib.
In the case of a multi-arch dylib where none of the architectures
is the host architecture, otool -D returned multiple install names.
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 803d0da..21c361d 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -2425,7 +2425,10 @@ bool cmSystemTools::GuessLibraryInstallName(std::string
const& fullPath,
RunSingleCommand(cmds, &output, 0, 0, OUTPUT_NONE);
std::vector<std::string> strs = cmSystemTools::tokenize(output, "\n");
- if(strs.size() == 2)
+ // otool returns extra lines reporting multiple install names
+ // in case the binary is multi-arch and none of the architectures
+ // is native (e.g. i386;ppc on x86_64)
+ if(strs.size() >= 2)
{
soname = strs[1];
return true;
-----------------------------------------------------------------------
Summary of changes:
Source/cmSystemTools.cxx | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
