From e2ff9a73fa46b29b6d44378de1fd9369dceee308 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Thu, 27 Jan 2005 16:43:18 -0500 Subject: ENH: fix a few more xcode things --- Source/cmGlobalXCodeGenerator.cxx | 4 ++-- Source/cmXCodeObject.cxx | 22 ++++++++++++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 6f8d1d9..0a42643 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -113,11 +113,11 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg, cmXCodeObject* settings = this->CreateObject(cmXCodeObject::ATTRIBUTE_GROUP); buildFile->AddAttribute("settings", settings); 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( lg->ConvertToRelativeOutputPath(sf->GetFullPath().c_str()).c_str())); fileRef->AddAttribute("refType", this->CreateString("4")); - fileRef->AddAttribute("sourceTree", this->CreateString("")); + fileRef->AddAttribute("sourceTree", this->CreateString("\"\"")); return buildFile; } diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx index e364687..3de51fa 100644 --- a/Source/cmXCodeObject.cxx +++ b/Source/cmXCodeObject.cxx @@ -50,14 +50,14 @@ void cmXCodeObject::Print(std::ostream& out) } 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++) { cmXCodeObject::Indent(4, out); out << i->second->m_List[k]->m_Id << ",\n"; } cmXCodeObject::Indent(3, out); - out << "};\n"; + out << ");\n"; } 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) { 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); out << "};\n"; @@ -77,7 +84,14 @@ void cmXCodeObject::Print(std::ostream& out) } 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 { -- cgit v0.12