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

cmGlobalVisualStudio10Generator: Re-order some methods 

Order SetSystemName and SetGeneratorToolset method declarations
and definitions as they are called.
This commit is contained in:
Brad King 2014-09-05 13:43:52 -04:00
parent 03b7b6cda1
commit ad2a4776aa
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Source/cmGlobalVisualStudio10Generator.cxx
View File

@ -115,19 +115,6 @@ cmGlobalVisualStudio10Generator::MatchesGeneratorName(
return false; return false;
} }
//----------------------------------------------------------------------------
bool
cmGlobalVisualStudio10Generator::SetGeneratorToolset(std::string const& ts,
cmMakefile* mf)
{
this->GeneratorToolset = ts;
if(const char* toolset = this->GetPlatformToolset())
{
mf->AddDefinition("CMAKE_VS_PLATFORM_TOOLSET", toolset);
}
return true;
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool cmGlobalVisualStudio10Generator::SetSystemName(std::string const& s, bool cmGlobalVisualStudio10Generator::SetSystemName(std::string const& s,
cmMakefile* mf) cmMakefile* mf)
@ -148,6 +135,19 @@ bool cmGlobalVisualStudio10Generator::SetSystemName(std::string const& s,
return this->cmGlobalVisualStudio8Generator::SetSystemName(s, mf); return this->cmGlobalVisualStudio8Generator::SetSystemName(s, mf);
} }
//----------------------------------------------------------------------------
bool
cmGlobalVisualStudio10Generator::SetGeneratorToolset(std::string const& ts,
cmMakefile* mf)
{
this->GeneratorToolset = ts;
if(const char* toolset = this->GetPlatformToolset())
{
mf->AddDefinition("CMAKE_VS_PLATFORM_TOOLSET", toolset);
}
return true;
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool cmGlobalVisualStudio10Generator::InitializeSystem(cmMakefile* mf) bool cmGlobalVisualStudio10Generator::InitializeSystem(cmMakefile* mf)
{ {

2
Source/cmGlobalVisualStudio10Generator.h
View File

@ -30,8 +30,8 @@ public:
virtual bool MatchesGeneratorName(const std::string& name) const; virtual bool MatchesGeneratorName(const std::string& name) const;
virtual bool SetGeneratorToolset(std::string const& ts, cmMakefile* mf);
virtual bool SetSystemName(std::string const& s, cmMakefile* mf); virtual bool SetSystemName(std::string const& s, cmMakefile* mf);
virtual bool SetGeneratorToolset(std::string const& ts, cmMakefile* mf);
virtual void GenerateBuildCommand( virtual void GenerateBuildCommand(
std::vector<std::string>& makeCommand, std::vector<std::string>& makeCommand,