diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-17 16:34:21 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-07-17 16:34:21 -0400 |
| commit | 6e176e6d9efa80fb4d08f1ead6bc33f115f8885d (patch) | |
| tree | a21e174293423fa20a15ee6e2d37703003e94379 /Source/cmGlobalVisualStudio10Generator.cxx | |
| parent | d3d9218a52dad04c1cfa87e537d98ee0678db1db (diff) | |
| download | cmake-6e176e6d9efa80fb4d08f1ead6bc33f115f8885d.tar.gz | |
VS: Delay platform definitions until system name is known
Move the definition of CMAKE_VS_PLATFORM_NAME and other variables that
are not needed by CMakeDetermineSystem out of the AddPlatformDefinitions
method and into a SetSystemName method. The latter may later use
CMAKE_SYSTEM_NAME to decide what platform-specific definitions to add.
Diffstat (limited to 'Source/cmGlobalVisualStudio10Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index 80d08b99a8..03b2b2f094 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -125,10 +125,11 @@ cmGlobalVisualStudio10Generator::SetGeneratorToolset(std::string const& ts, } //---------------------------------------------------------------------------- -void cmGlobalVisualStudio10Generator::AddPlatformDefinitions(cmMakefile* mf) +bool cmGlobalVisualStudio10Generator::SetSystemName(std::string const& s, + cmMakefile* mf) { - cmGlobalVisualStudio8Generator::AddPlatformDefinitions(mf); this->AddVSPlatformToolsetDefinition(mf); + return this->cmGlobalVisualStudio8Generator::SetSystemName(s, mf); } //---------------------------------------------------------------------------- |