mirror of
https://github.com/reactos/CMake.git
synced 2024-12-05 02:06:34 +00:00
VS: Port utility depends to cmGeneratorTarget
This commit is contained in:
parent
330bfa8336
commit
600af01d41
@ -310,7 +310,7 @@ void cmGlobalVisualStudio6Generator::WriteProject(std::ostream& fout,
|
||||
}
|
||||
fout << "}}}\n\n";
|
||||
|
||||
UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target);
|
||||
UtilityDependsMap::iterator ui = this->UtilityDepends.find(target);
|
||||
if(ui != this->UtilityDepends.end())
|
||||
{
|
||||
const char* uname = ui->second.c_str();
|
||||
|
@ -180,7 +180,7 @@ cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
|
||||
|
||||
fout <<"EndProject\n";
|
||||
|
||||
UtilityDependsMap::iterator ui = this->UtilityDepends.find(t->Target);
|
||||
UtilityDependsMap::iterator ui = this->UtilityDepends.find(t);
|
||||
if(ui != this->UtilityDepends.end())
|
||||
{
|
||||
const char* uname = ui->second.c_str();
|
||||
|
@ -704,7 +704,7 @@ void cmGlobalVisualStudio7Generator::WriteProject(std::ostream& fout,
|
||||
<< dspname << ext << "\", \"{"
|
||||
<< 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())
|
||||
{
|
||||
const char* uname = ui->second.c_str();
|
||||
@ -748,7 +748,7 @@ cmGlobalVisualStudio7Generator
|
||||
depcount++;
|
||||
}
|
||||
|
||||
UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target);
|
||||
UtilityDependsMap::iterator ui = this->UtilityDepends.find(target);
|
||||
if(ui != this->UtilityDepends.end())
|
||||
{
|
||||
const char* uname = ui->second.c_str();
|
||||
|
@ -488,7 +488,7 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(
|
||||
{
|
||||
// Direct dependency on linkable target not allowed.
|
||||
// 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
|
||||
cmGlobalVisualStudioGenerator::GetUtilityDepend(cmTarget const* target)
|
||||
cmGlobalVisualStudioGenerator::GetUtilityDepend(
|
||||
cmGeneratorTarget const* target)
|
||||
{
|
||||
UtilityDependsMap::iterator i = this->UtilityDepends.find(target);
|
||||
if(i == this->UtilityDepends.end())
|
||||
{
|
||||
std::string name = this->WriteUtilityDepend(target);
|
||||
std::string name = this->WriteUtilityDepend(target->Target);
|
||||
UtilityDependsMap::value_type entry(target, name);
|
||||
i = this->UtilityDepends.insert(entry).first;
|
||||
}
|
||||
|
@ -129,8 +129,8 @@ protected:
|
||||
bool CheckTargetLinks(cmTarget& target, const std::string& name);
|
||||
std::string GetUtilityForTarget(cmTarget& target, const std::string&);
|
||||
virtual std::string WriteUtilityDepend(cmTarget const*) = 0;
|
||||
std::string GetUtilityDepend(cmTarget const* target);
|
||||
typedef std::map<cmTarget const*, std::string> UtilityDependsMap;
|
||||
std::string GetUtilityDepend(const cmGeneratorTarget *target);
|
||||
typedef std::map<cmGeneratorTarget const*, std::string> UtilityDependsMap;
|
||||
UtilityDependsMap UtilityDepends;
|
||||
|
||||
protected:
|
||||
|
Loading…
Reference in New Issue
Block a user