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

VS: Port WriteUtilityDepends to cmGeneratorTarget

This commit is contained in:
Stephen Kelly 2015-10-23 18:26:47 +02:00
parent 600af01d41
commit 97b3768898
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmGlobalVisualStudio6Generator.cxx
View File

@ -383,12 +383,14 @@ void cmGlobalVisualStudio6Generator::WriteDSWHeader(std::ostream& fout)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
std::string std::string
cmGlobalVisualStudio6Generator::WriteUtilityDepend(const cmTarget *target) cmGlobalVisualStudio6Generator::WriteUtilityDepend(
const cmGeneratorTarget *target)
{ {
std::string pname = target->GetName(); std::string pname = target->GetName();
pname += "_UTILITY"; pname += "_UTILITY";
pname = GetVS6TargetName(pname.c_str()); pname = GetVS6TargetName(pname.c_str());
std::string fname = target->GetMakefile()->GetCurrentBinaryDirectory(); std::string fname =
target->GetLocalGenerator()->GetCurrentBinaryDirectory();
fname += "/"; fname += "/";
fname += pname; fname += pname;
fname += ".dsp"; fname += ".dsp";

2
Source/cmGlobalVisualStudio6Generator.h
View File

@ -97,7 +97,7 @@ private:
const std::string& name, const char* path, const std::string& name, const char* path,
const std::set<std::string>& dependencies); const std::set<std::string>& dependencies);
void WriteDSWFooter(std::ostream& fout); void WriteDSWFooter(std::ostream& fout);
virtual std::string WriteUtilityDepend(cmTarget const* target); virtual std::string WriteUtilityDepend(const cmGeneratorTarget *target);
std::string MSDevCommand; std::string MSDevCommand;
bool MSDevCommandInitialized; bool MSDevCommandInitialized;
std::string const& GetMSDevCommand(); std::string const& GetMSDevCommand();

7
Source/cmGlobalVisualStudio7Generator.cxx
View File

@ -888,13 +888,14 @@ void cmGlobalVisualStudio7Generator::WriteSLNHeader(std::ostream& fout)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
std::string std::string
cmGlobalVisualStudio7Generator::WriteUtilityDepend(cmTarget const* target) cmGlobalVisualStudio7Generator::WriteUtilityDepend(
cmGeneratorTarget const* target)
{ {
std::vector<std::string> configs; std::vector<std::string> configs;
target->GetMakefile()->GetConfigurations(configs); target->Target->GetMakefile()->GetConfigurations(configs);
std::string pname = target->GetName(); std::string pname = target->GetName();
pname += "_UTILITY"; pname += "_UTILITY";
std::string fname = target->GetMakefile()->GetCurrentBinaryDirectory(); std::string fname = target->GetLocalGenerator()->GetCurrentBinaryDirectory();
fname += "/"; fname += "/";
fname += pname; fname += pname;
fname += ".vcproj"; fname += ".vcproj";

2
Source/cmGlobalVisualStudio7Generator.h
View File

@ -136,7 +136,7 @@ protected:
cmLocalGenerator* root); cmLocalGenerator* root);
virtual void WriteSLNFooter(std::ostream& fout); virtual void WriteSLNFooter(std::ostream& fout);
virtual void WriteSLNHeader(std::ostream& fout); virtual void WriteSLNHeader(std::ostream& fout);
virtual std::string WriteUtilityDepend(cmTarget const* target); virtual std::string WriteUtilityDepend(const cmGeneratorTarget *target);
virtual void WriteTargetsToSolution( virtual void WriteTargetsToSolution(
std::ostream& fout, std::ostream& fout,

2
Source/cmGlobalVisualStudioGenerator.cxx
View File

@ -514,7 +514,7 @@ cmGlobalVisualStudioGenerator::GetUtilityDepend(
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->Target); std::string name = this->WriteUtilityDepend(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;
} }

2
Source/cmGlobalVisualStudioGenerator.h
View File

@ -128,7 +128,7 @@ 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(cmGeneratorTarget const*) = 0;
std::string GetUtilityDepend(const cmGeneratorTarget *target); std::string GetUtilityDepend(const cmGeneratorTarget *target);
typedef std::map<cmGeneratorTarget const*, std::string> UtilityDependsMap; typedef std::map<cmGeneratorTarget const*, std::string> UtilityDependsMap;
UtilityDependsMap UtilityDepends; UtilityDependsMap UtilityDepends;