diff options
| author | Brad King <brad.king@kitware.com> | 2013-06-14 12:59:54 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-06-14 12:59:54 (GMT) |
| commit | bc3a7b61e261c9299b81d572d3fa3c78f87ec075 (patch) | |
| tree | b371128d8d2166ea40fb9416454c3e60b55d454a | |
| parent | 3aaf04365c014a7a71ce5edbdb2d739349f120d1 (diff) | |
| parent | ff01f8b60025cca88ebcba9b83ab9492b1521c2c (diff) | |
| download | CMake-bc3a7b61e261c9299b81d572d3fa3c78f87ec075.zip CMake-bc3a7b61e261c9299b81d572d3fa3c78f87ec075.tar.gz CMake-bc3a7b61e261c9299b81d572d3fa3c78f87ec075.tar.bz2 | |
Merge topic 'rpath-on-mac'
ff01f8b OS X: Improvements for getting install name of dylib.
| -rw-r--r-- | Source/cmSystemTools.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
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; |