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

VS: Port ComputeLongestObjectDirectory to cmGeneratorTarget

This commit is contained in:
Stephen Kelly 2015-10-23 18:26:38 +02:00
parent 01c2698693
commit 26e23e8463
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmLocalVisualStudio6Generator.cxx
View File

@ -1935,7 +1935,7 @@ cmLocalVisualStudio6Generator
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
std::string std::string
cmLocalVisualStudio6Generator cmLocalVisualStudio6Generator
::ComputeLongestObjectDirectory(cmTarget&) const ::ComputeLongestObjectDirectory(cmGeneratorTarget const*) const
{ {
// Compute the maximum length configuration name. // Compute the maximum length configuration name.
std::string config_max; std::string config_max;

3
Source/cmLocalVisualStudio6Generator.h
View File

@ -50,7 +50,8 @@ public:
virtual virtual
std::string GetTargetDirectory(cmGeneratorTarget const* target) const; std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
virtual std::string ComputeLongestObjectDirectory(cmTarget&) const; virtual std::string
ComputeLongestObjectDirectory(cmGeneratorTarget const*) const;
private: private:
std::string DSPHeaderTemplate; std::string DSPHeaderTemplate;
std::string DSPFooterTemplate; std::string DSPFooterTemplate;

8
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -1689,10 +1689,10 @@ cmLocalVisualStudio7GeneratorFCInfo
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
std::string std::string
cmLocalVisualStudio7Generator cmLocalVisualStudio7Generator
::ComputeLongestObjectDirectory(cmTarget& target) const ::ComputeLongestObjectDirectory(cmGeneratorTarget const* target) const
{ {
std::vector<std::string> configs; std::vector<std::string> configs;
target.GetMakefile()->GetConfigurations(configs); target->Target->GetMakefile()->GetConfigurations(configs);
// Compute the maximum length configuration name. // Compute the maximum length configuration name.
std::string config_max; std::string config_max;
@ -1711,9 +1711,7 @@ cmLocalVisualStudio7Generator
std::string dir_max; std::string dir_max;
dir_max += this->GetCurrentBinaryDirectory(); dir_max += this->GetCurrentBinaryDirectory();
dir_max += "/"; dir_max += "/";
cmGeneratorTarget* gt = dir_max += this->GetTargetDirectory(target);
this->GlobalGenerator->GetGeneratorTarget(&target);
dir_max += this->GetTargetDirectory(gt);
dir_max += "/"; dir_max += "/";
dir_max += config_max; dir_max += config_max;
dir_max += "/"; dir_max += "/";

3
Source/cmLocalVisualStudio7Generator.h
View File

@ -56,7 +56,8 @@ public:
std::string GetTargetDirectory(cmGeneratorTarget const* target) const; std::string GetTargetDirectory(cmGeneratorTarget const* target) const;
cmSourceFile* CreateVCProjBuildRule(); cmSourceFile* CreateVCProjBuildRule();
void WriteStampFiles(); void WriteStampFiles();
virtual std::string ComputeLongestObjectDirectory(cmTarget&) const; virtual std::string
ComputeLongestObjectDirectory(cmGeneratorTarget const*) const;
virtual void ReadAndStoreExternalGUID(const std::string& name, virtual void ReadAndStoreExternalGUID(const std::string& name,
const char* path); const char* path);

2
Source/cmLocalVisualStudioGenerator.cxx
View File

@ -43,7 +43,7 @@ void cmLocalVisualStudioGenerator::ComputeObjectFilenames(
std::map<cmSourceFile const*, std::string>& mapping, std::map<cmSourceFile const*, std::string>& mapping,
cmGeneratorTarget const* gt) cmGeneratorTarget const* gt)
{ {
std::string dir_max = this->ComputeLongestObjectDirectory(*gt->Target); std::string dir_max = this->ComputeLongestObjectDirectory(gt);
// Count the number of object files with each name. Note that // Count the number of object files with each name. Note that
// windows file names are not case sensitive. // windows file names are not case sensitive.

3
Source/cmLocalVisualStudioGenerator.h
View File

@ -44,7 +44,8 @@ public:
cmGlobalVisualStudioGenerator::VSVersion GetVersion() const; cmGlobalVisualStudioGenerator::VSVersion GetVersion() const;
virtual std::string ComputeLongestObjectDirectory(cmTarget&) const = 0; virtual std::string
ComputeLongestObjectDirectory(cmGeneratorTarget const*) const = 0;
virtual void AddCMakeListsRules() = 0; virtual void AddCMakeListsRules() = 0;