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 f5e5ce4d567844c95185b23071f9c73f771abc19 (commit) via 84698abb514b665c5db5111ecf247d44b9979844 (commit) via 46558d290be1760828714545f41afae17b0c71c9 (commit) from a8b552af1266ab35a09219eb613974d3fab4a641 (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=f5e5ce4d567844c95185b23071f9c73f771abc19 commit f5e5ce4d567844c95185b23071f9c73f771abc19 Merge: a8b552a 84698ab Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Sat Jul 27 00:40:26 2013 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Sat Jul 27 00:40:26 2013 -0400 Merge topic 'rpath-on-mac' into next 84698ab OS X: If necessary, use xcrun to help find otool used to query install names. 46558d2 CMake Nightly Date Stamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84698abb514b665c5db5111ecf247d44b9979844 commit 84698abb514b665c5db5111ecf247d44b9979844 Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Fri Jul 26 22:17:30 2013 -0600 Commit: Clinton Stimpson <clin...@elemtech.com> CommitDate: Fri Jul 26 22:38:57 2013 -0600 OS X: If necessary, use xcrun to help find otool used to query install names. This fixes querying for @rpath install names when using Xcode without the command line tools installed. diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index c52c266..37344dc 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -2464,7 +2464,15 @@ bool cmSystemTools::GuessLibraryInstallName(std::string const& fullPath, cmds.push_back(fullPath.c_str()); std::string output; - RunSingleCommand(cmds, &output, 0, 0, OUTPUT_NONE); + if(!RunSingleCommand(cmds, &output, 0, 0, OUTPUT_NONE)) + { + cmds.insert(cmds.begin(), "-r"); + cmds.insert(cmds.begin(), "xcrun"); + if(!RunSingleCommand(cmds, &output, 0, 0, OUTPUT_NONE)) + { + return false; + } + } std::vector<std::string> strs = cmSystemTools::tokenize(output, "\n"); // otool returns extra lines reporting multiple install names ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- Source/cmSystemTools.cxx | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits