diff options
| author | Brad King <brad.king@kitware.com> | 2014-09-05 17:43:52 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-09-05 17:43:52 (GMT) |
| commit | ad2a4776aa34c84a069a9e4d83ea32174ac6e6ac (patch) | |
| tree | eecb7b4d1722fae2a296bb66e61c84974f94f5b9 | |
| parent | 03b7b6cda1016dd16491f8051b45a5baa85f2282 (diff) | |
| download | CMake-ad2a4776aa34c84a069a9e4d83ea32174ac6e6ac.zip CMake-ad2a4776aa34c84a069a9e4d83ea32174ac6e6ac.tar.gz CMake-ad2a4776aa34c84a069a9e4d83ea32174ac6e6ac.tar.bz2 | |
cmGlobalVisualStudio10Generator: Re-order some methods
Order SetSystemName and SetGeneratorToolset method declarations
and definitions as they are called.
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.cxx | 26 | ||||
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.h | 2 |
2 files changed, 14 insertions, 14 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index 63c32f9..063e9e1 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -116,19 +116,6 @@ cmGlobalVisualStudio10Generator::MatchesGeneratorName( } //---------------------------------------------------------------------------- -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, cmMakefile* mf) { @@ -149,6 +136,19 @@ bool cmGlobalVisualStudio10Generator::SetSystemName(std::string const& s, } //---------------------------------------------------------------------------- +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) { if(this->SystemName == "WindowsPhone") diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h index f05b174..1155508 100644 --- a/Source/cmGlobalVisualStudio10Generator.h +++ b/Source/cmGlobalVisualStudio10Generator.h @@ -30,8 +30,8 @@ public: 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 SetGeneratorToolset(std::string const& ts, cmMakefile* mf); virtual void GenerateBuildCommand( std::vector<std::string>& makeCommand, |