summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudio10Generator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-09-05 17:43:52 (GMT)
committerBrad King <brad.king@kitware.com>2014-09-05 17:43:52 (GMT)
commitad2a4776aa34c84a069a9e4d83ea32174ac6e6ac (patch)
treeeecb7b4d1722fae2a296bb66e61c84974f94f5b9 /Source/cmGlobalVisualStudio10Generator.cxx
parent03b7b6cda1016dd16491f8051b45a5baa85f2282 (diff)
downloadCMake-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.
Diffstat (limited to 'Source/cmGlobalVisualStudio10Generator.cxx')
-rw-r--r--Source/cmGlobalVisualStudio10Generator.cxx26
1 files changed, 13 insertions, 13 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")