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

Merge topic 'xcode-select'

Browse Source 
e88bae7 Xcode: Run xcode-select to find Xcode version file (#13463)
This commit is contained in:
David Cole 2012-08-13 13:28:49 -04:00 committed by CMake Topic Stage
commit f0295575d7
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/cmGlobalXCodeGenerator.cxx
View File

@ -136,8 +136,23 @@ cmGlobalGenerator* cmGlobalXCodeGenerator::New()
{ {
#if defined(CMAKE_BUILD_WITH_CMAKE) #if defined(CMAKE_BUILD_WITH_CMAKE)
cmXcodeVersionParser parser; cmXcodeVersionParser parser;
if (cmSystemTools::FileExists( std::string versionFile;
"/Applications/Xcode.app/Contents/version.plist")) {
std::string out;
std::string::size_type pos;
if(cmSystemTools::RunSingleCommand("xcode-select --print-path", &out, 0, 0,
cmSystemTools::OUTPUT_NONE) &&
(pos = out.find(".app/"), pos != out.npos))
{
versionFile = out.substr(0, pos+5)+"Contents/version.plist";
}
}
if(!versionFile.empty() && cmSystemTools::FileExists(versionFile.c_str()))
{
parser.ParseFile(versionFile.c_str());
}
else if (cmSystemTools::FileExists(
"/Applications/Xcode.app/Contents/version.plist"))
{ {
parser.ParseFile parser.ParseFile
("/Applications/Xcode.app/Contents/version.plist"); ("/Applications/Xcode.app/Contents/version.plist");