kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'rpath-on-mac' 

84698ab OS X: If necessary, use xcrun to help find otool used to query install names.
This commit is contained in:
Brad King 2013-07-29 09:55:15 -04:00 committed by CMake Topic Stage
parent 64bb8f4d19 84698abb51
commit 3c683d788d
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmSystemTools.cxx
View File

@ -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