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

BUG: Fix issue #8481 - generate Xcode projects such that breakpoints may be used from the Xcode debugger without adjusting any settings within the Xcode GUI first... Thanks to Doug Gregor for the patch.

This commit is contained in:
David Cole 2009-07-22 11:14:23 -04:00
parent 7328a38480
commit 17d707254d
1 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Source/cmGlobalXCodeGenerator.cxx
View File

@ -672,6 +672,23 @@ cmGlobalXCodeGenerator::CreateXCodeFileReference(cmSourceFile* sf,
cmSystemTools::SplitProgramPath(sf->GetFullPath().c_str(),
dir, file);
// Try to make the path relative to the project root.
bool Absolute = true;
if (this->XcodeVersion >= 30)
{
std::string relative =
this->CurrentLocalGenerator->Convert(sf->GetFullPath().c_str(),
cmLocalGenerator::HOME,
cmLocalGenerator::MAKEFILE,
false);
relative = cmSystemTools::ConvertToOutputPath(relative.c_str());
if (!relative.empty() && relative[0] != '/')
{
Absolute = false;
path = relative;
}
}
fileRef->AddAttribute("name", this->CreateString(file.c_str()));
fileRef->AddAttribute("path", this->CreateString(path.c_str()));
if(this->XcodeVersion == 15)
@ -682,10 +699,14 @@ cmGlobalXCodeGenerator::CreateXCodeFileReference(cmSourceFile* sf,
{
fileRef->AddAttribute("sourceTree", this->CreateString("<group>"));
}
else
else if (Absolute)
{
fileRef->AddAttribute("sourceTree", this->CreateString("<absolute>"));
}
else
{
fileRef->AddAttribute("sourceTree", this->CreateString("SOURCE_ROOT"));
}
return fileRef;
}
@ -2581,8 +2602,18 @@ void cmGlobalXCodeGenerator
{
std::string proot = root->GetMakefile()->GetCurrentDirectory();
proot = this->ConvertToRelativeForXCode(proot.c_str());
this->RootObject->AddAttribute("projectRoot",
this->CreateString(proot.c_str()));
if (this->XcodeVersion >= 30)
{
this->RootObject->AddAttribute("projectRoot",
this->CreateString(""));
this->RootObject->AddAttribute("projectDirPath",
this->CreateString(proot.c_str()));
}
else
{
this->RootObject->AddAttribute("projectRoot",
this->CreateString(proot.c_str()));
}
}
cmXCodeObject* configlist =
this->CreateObject(cmXCodeObject::XCConfigurationList);