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

VS: Simplify ;-separated attribute value parsing 

An implementation ;-separated list parsing was added by commit a1f976ce
(VS: Add support for three new project properties, 2011-11-23) and again
by commit 9e01aefd (VS: Add support for WinRT project properties,
2012-02-03).  Refactor both instances to use ExpandListArgument.
This commit is contained in:
Brad King 2012-02-03 14:32:17 -05:00
parent 9e01aefd24
commit a03447b3df
1 changed files with 20 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Source/cmVisualStudio10TargetGenerator.cxx
View File

@ -269,63 +269,49 @@ void cmVisualStudio10TargetGenerator::Generate()
void cmVisualStudio10TargetGenerator::WriteDotNetReferences() void cmVisualStudio10TargetGenerator::WriteDotNetReferences()
{ {
const char* vsDotNetReferences std::vector<std::string> references;
= this->Target->GetProperty("VS_DOTNET_REFERENCES"); if(const char* vsDotNetReferences =
if(vsDotNetReferences) this->Target->GetProperty("VS_DOTNET_REFERENCES"))
{
cmSystemTools::ExpandListArgument(vsDotNetReferences, references);
}
if(!references.empty())
{ {
std::string references(vsDotNetReferences);
std::string::size_type position = 0;
this->WriteString("<ItemGroup>\n", 1); this->WriteString("<ItemGroup>\n", 1);
while(references.length() > 0) for(std::vector<std::string>::iterator ri = references.begin();
ri != references.end(); ++ri)
{ {
if((position = references.find(";")) == std::string::npos)
{
position = references.length() + 1;
}
this->WriteString("<Reference Include=\"", 2); this->WriteString("<Reference Include=\"", 2);
(*this->BuildFileStream) << (*this->BuildFileStream) << cmVS10EscapeXML(*ri) << "\">\n";
cmVS10EscapeXML(references.substr(0, position)) << "\">\n";
this->WriteString("<CopyLocalSatelliteAssemblies>true" this->WriteString("<CopyLocalSatelliteAssemblies>true"
"</CopyLocalSatelliteAssemblies>\n", 3); "</CopyLocalSatelliteAssemblies>\n", 3);
this->WriteString("<ReferenceOutputAssembly>true" this->WriteString("<ReferenceOutputAssembly>true"
"</ReferenceOutputAssembly>\n", 3); "</ReferenceOutputAssembly>\n", 3);
this->WriteString("</Reference>\n", 2); this->WriteString("</Reference>\n", 2);
references.erase(0, position + 1);
} }
this->WriteString("</ItemGroup>\n", 1); this->WriteString("</ItemGroup>\n", 1);
} }
} }
void cmVisualStudio10TargetGenerator::WriteWinRTReferences() void cmVisualStudio10TargetGenerator::WriteWinRTReferences()
{ {
const char* vsWinRTReferences std::vector<std::string> references;
= this->Target->GetProperty("VS_WINRT_REFERENCES"); if(const char* vsWinRTReferences =
if(vsWinRTReferences) this->Target->GetProperty("VS_WINRT_REFERENCES"))
{
cmSystemTools::ExpandListArgument(vsWinRTReferences, references);
}
if(!references.empty())
{ {
std::string references(vsWinRTReferences);
std::string::size_type position = 0;
this->WriteString("<ItemGroup>\n", 1); this->WriteString("<ItemGroup>\n", 1);
while(references.length() > 0) for(std::vector<std::string>::iterator ri = references.begin();
ri != references.end(); ++ri)
{ {
if((position = references.find(";")) == std::string::npos)
{
position = references.length() + 1;
}
this->WriteString("<Reference Include=\"", 2); this->WriteString("<Reference Include=\"", 2);
(*this->BuildFileStream) << (*this->BuildFileStream) << cmVS10EscapeXML(*ri) << "\">\n";
cmVS10EscapeXML(references.substr(0, position)) << "\">\n";
this->WriteString("<IsWinMDFile>true</IsWinMDFile>\n", 3); this->WriteString("<IsWinMDFile>true</IsWinMDFile>\n", 3);
this->WriteString("</Reference>\n", 2); this->WriteString("</Reference>\n", 2);
references.erase(0, position + 1);
} }
this->WriteString("</ItemGroup>\n", 1); this->WriteString("</ItemGroup>\n", 1);
} }
} }