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

ENH: fix a few more xcode things

This commit is contained in:
Bill Hoffman 2005-01-27 16:43:18 -05:00
parent df730d29de
commit e2ff9a73fa
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmGlobalXCodeGenerator.cxx
View File

@ -113,11 +113,11 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
cmXCodeObject* settings = this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP); cmXCodeObject* settings = this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP);
buildFile->AddAttribute("settings", settings); buildFile->AddAttribute("settings", settings);
fileRef->AddAttribute("fileEncoding", this->CreateString("4")); fileRef->AddAttribute("fileEncoding", this->CreateString("4"));
fileRef->AddAttribute("lastKnownFileType", this->CreateString("sourcecode.cpp.cpp;")); fileRef->AddAttribute("lastKnownFileType", this->CreateString("sourcecode.cpp.cpp"));
fileRef->AddAttribute("path", this->CreateString( fileRef->AddAttribute("path", this->CreateString(
lg->ConvertToRelativeOutputPath(sf->GetFullPath().c_str()).c_str())); lg->ConvertToRelativeOutputPath(sf->GetFullPath().c_str()).c_str()));
fileRef->AddAttribute("refType", this->CreateString("4")); fileRef->AddAttribute("refType", this->CreateString("4"));
fileRef->AddAttribute("sourceTree", this->CreateString("<group>")); fileRef->AddAttribute("sourceTree", this->CreateString("\"<group>\""));
return buildFile; return buildFile;
} }

22
Source/cmXCodeObject.cxx
View File

@ -50,14 +50,14 @@ void cmXCodeObject::Print(std::ostream& out)
} }
else if(object->m_Type == OBJECT_LIST) else if(object->m_Type == OBJECT_LIST)
{ {
out << i->first << " = {\n"; out << i->first << " = (\n";
for(unsigned int k = 0; k < i->second->m_List.size(); k++) for(unsigned int k = 0; k < i->second->m_List.size(); k++)
{ {
cmXCodeObject::Indent(4, out); cmXCodeObject::Indent(4, out);
out << i->second->m_List[k]->m_Id << ",\n"; out << i->second->m_List[k]->m_Id << ",\n";
} }
cmXCodeObject::Indent(3, out); cmXCodeObject::Indent(3, out);
out << "};\n"; out << ");\n";
} }
else if(object->m_Type == ATTRIBUTE_GROUP) else if(object->m_Type == ATTRIBUTE_GROUP)
{ {
@ -66,7 +66,14 @@ void cmXCodeObject::Print(std::ostream& out)
for(j = object->m_ObjectAttributes.begin(); j != object->m_ObjectAttributes.end(); ++j) for(j = object->m_ObjectAttributes.begin(); j != object->m_ObjectAttributes.end(); ++j)
{ {
cmXCodeObject::Indent(4, out); cmXCodeObject::Indent(4, out);
out << j->first << " = " << j->second->m_String << ";\n"; if(object->m_String.size() )
{
out << j->first << " = " << j->second->m_String << ";\n";
}
else
{
out << j->first << " = " << "\"\";\n";
}
} }
cmXCodeObject::Indent(3, out); cmXCodeObject::Indent(3, out);
out << "};\n"; out << "};\n";
@ -77,7 +84,14 @@ void cmXCodeObject::Print(std::ostream& out)
} }
else if(object->m_Type == STRING) else if(object->m_Type == STRING)
{ {
out << i->first << " = " << object->m_String << ";\n"; if(object->m_String.size() )
{
out << i->first << " = " << object->m_String << ";\n";
}
else
{
out << i->first << " = " << "\"\";\n";
}
} }
else else
{ {