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

VS: Port utility depends to cmGeneratorTarget

Browse Source
This commit is contained in:
Stephen Kelly 2015-10-23 18:26:46 +02:00
parent 330bfa8336
commit 600af01d41
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmGlobalVisualStudio6Generator.cxx
View File

@ -310,7 +310,7 @@ void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
} }
fout << "}}}\n\n"; fout << "}}}\n\n";
UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target); UtilityDependsMap::iterator ui = this->UtilityDepends.find(target);
if(ui != this->UtilityDepends.end()) if(ui != this->UtilityDepends.end())
{ {
const char* uname = ui->second.c_str(); const char* uname = ui->second.c_str();

2
Source/cmGlobalVisualStudio71Generator.cxx
View File

@ -180,7 +180,7 @@ cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
fout <<"EndProject\n"; fout <<"EndProject\n";
UtilityDependsMap::iterator ui = this->UtilityDepends.find(t->Target); UtilityDependsMap::iterator ui = this->UtilityDepends.find(t);
if(ui != this->UtilityDepends.end()) if(ui != this->UtilityDepends.end())
{ {
const char* uname = ui->second.c_str(); const char* uname = ui->second.c_str();

4
Source/cmGlobalVisualStudio7Generator.cxx
View File

@ -704,7 +704,7 @@ void cmGlobalVisualStudio7Generator::WriteProject(std::ostream& fout,
<< dspname << ext << "\", \"{" << dspname << ext << "\", \"{"
<< this->GetGUID(dspname) << "}\"\nEndProject\n"; << this->GetGUID(dspname) << "}\"\nEndProject\n";
UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target); UtilityDependsMap::iterator ui = this->UtilityDepends.find(target);
if(ui != this->UtilityDepends.end()) if(ui != this->UtilityDepends.end())
{ {
const char* uname = ui->second.c_str(); const char* uname = ui->second.c_str();
@ -748,7 +748,7 @@ cmGlobalVisualStudio7Generator
depcount++; depcount++;
} }
UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target); UtilityDependsMap::iterator ui = this->UtilityDepends.find(target);
if(ui != this->UtilityDepends.end()) if(ui != this->UtilityDepends.end())
{ {
const char* uname = ui->second.c_str(); const char* uname = ui->second.c_str();

7
Source/cmGlobalVisualStudioGenerator.cxx
View File

@ -488,7 +488,7 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(
{ {
// Direct dependency on linkable target not allowed. // Direct dependency on linkable target not allowed.
// Use an intermediate utility target. // Use an intermediate utility target.
vsTargetDepend.insert(this->GetUtilityDepend(dep)); vsTargetDepend.insert(this->GetUtilityDepend(dgt));
} }
} }
} }
@ -508,12 +508,13 @@ void cmGlobalVisualStudioGenerator::FindMakeProgram(cmMakefile* mf)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
std::string std::string
cmGlobalVisualStudioGenerator::GetUtilityDepend(cmTarget const* target) cmGlobalVisualStudioGenerator::GetUtilityDepend(
cmGeneratorTarget const* target)
{ {
UtilityDependsMap::iterator i = this->UtilityDepends.find(target); UtilityDependsMap::iterator i = this->UtilityDepends.find(target);
if(i == this->UtilityDepends.end()) if(i == this->UtilityDepends.end())
{ {
std::string name = this->WriteUtilityDepend(target); std::string name = this->WriteUtilityDepend(target->Target);
UtilityDependsMap::value_type entry(target, name); UtilityDependsMap::value_type entry(target, name);
i = this->UtilityDepends.insert(entry).first; i = this->UtilityDepends.insert(entry).first;
} }

4
Source/cmGlobalVisualStudioGenerator.h
View File

@ -129,8 +129,8 @@ protected:
bool CheckTargetLinks(cmTarget& target, const std::string& name); bool CheckTargetLinks(cmTarget& target, const std::string& name);
std::string GetUtilityForTarget(cmTarget& target, const std::string&); std::string GetUtilityForTarget(cmTarget& target, const std::string&);
virtual std::string WriteUtilityDepend(cmTarget const*) = 0; virtual std::string WriteUtilityDepend(cmTarget const*) = 0;
std::string GetUtilityDepend(cmTarget const* target); std::string GetUtilityDepend(const cmGeneratorTarget *target);
typedef std::map<cmTarget const*, std::string> UtilityDependsMap; typedef std::map<cmGeneratorTarget const*, std::string> UtilityDependsMap;
UtilityDependsMap UtilityDepends; UtilityDependsMap UtilityDepends;
protected: protected: