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

VS: Convert 'WriteSource' tool argument to std::string

Browse Source
This commit is contained in:
Brad King 2014-07-29 13:26:19 -04:00
parent 38065563b6
commit 143b40051a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmVisualStudio10TargetGenerator.cxx
View File

@ -998,7 +998,7 @@ WriteGroupSources(const char* name,
} }
void cmVisualStudio10TargetGenerator::WriteSource( void cmVisualStudio10TargetGenerator::WriteSource(
const char* tool, cmSourceFile const* sf, const char* end) std::string const& tool, cmSourceFile const* sf, const char* end)
{ {
// Visual Studio tools append relative paths to the current dir, as in: // Visual Studio tools append relative paths to the current dir, as in:
// //
@ -1055,7 +1055,7 @@ void cmVisualStudio10TargetGenerator::WriteSource(
} }
void cmVisualStudio10TargetGenerator::WriteSources( void cmVisualStudio10TargetGenerator::WriteSources(
const char* tool, std::vector<cmSourceFile const*> const& sources) std::string const& tool, std::vector<cmSourceFile const*> const& sources)
{ {
for(std::vector<cmSourceFile const*>::const_iterator for(std::vector<cmSourceFile const*>::const_iterator
si = sources.begin(); si != sources.end(); ++si) si = sources.begin(); si != sources.end(); ++si)
@ -1086,7 +1086,7 @@ void cmVisualStudio10TargetGenerator::WriteAllSources()
si != objectSources.end(); ++si) si != objectSources.end(); ++si)
{ {
const std::string& lang = (*si)->GetLanguage(); const std::string& lang = (*si)->GetLanguage();
const char* tool = NULL; std::string tool;
if (lang == "C"|| lang == "CXX") if (lang == "C"|| lang == "CXX")
{ {
tool = "ClCompile"; tool = "ClCompile";
@ -1101,7 +1101,7 @@ void cmVisualStudio10TargetGenerator::WriteAllSources()
tool = "ResourceCompile"; tool = "ResourceCompile";
} }
if (tool) if (!tool.empty())
{ {
this->WriteSource(tool, *si, " "); this->WriteSource(tool, *si, " ");
if (this->OutputSourceSpecificFlags(*si)) if (this->OutputSourceSpecificFlags(*si))

4
Source/cmVisualStudio10TargetGenerator.h
View File

@ -57,9 +57,9 @@ private:
void WriteProjectConfigurations(); void WriteProjectConfigurations();
void WriteProjectConfigurationValues(); void WriteProjectConfigurationValues();
void WriteMSToolConfigurationValues(std::string const& config); void WriteMSToolConfigurationValues(std::string const& config);
void WriteSource(const char* tool, cmSourceFile const* sf, void WriteSource(std::string const& tool, cmSourceFile const* sf,
const char* end = 0); const char* end = 0);
void WriteSources(const char* tool, void WriteSources(std::string const& tool,
std::vector<cmSourceFile const*> const&); std::vector<cmSourceFile const*> const&);
void WriteAllSources(); void WriteAllSources();
void WriteDotNetReferences(); void WriteDotNetReferences();