diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-28 19:33:40 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-07-28 20:25:08 (GMT) |
| commit | d0dd28fa92cb2223e20f3586b8973a931aa61dac (patch) | |
| tree | c623586c9d13c169c280e987a8c13589546c8dc8 /Source | |
| parent | f188845237cdfee74dae0658888a61c855e285b3 (diff) | |
| download | CMake-d0dd28fa92cb2223e20f3586b8973a931aa61dac.zip CMake-d0dd28fa92cb2223e20f3586b8973a931aa61dac.tar.gz CMake-d0dd28fa92cb2223e20f3586b8973a931aa61dac.tar.bz2 | |
VS: Save system name and version in global generator members
Add to cmGlobalVisualStudio10Generator members for SystemName and
SystemVersion and populate them in SetSystemName.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index c1b087a..ad74537 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -128,6 +128,8 @@ cmGlobalVisualStudio10Generator::SetGeneratorToolset(std::string const& ts, bool cmGlobalVisualStudio10Generator::SetSystemName(std::string const& s, cmMakefile* mf) { + this->SystemName = s; + this->SystemVersion = mf->GetSafeDefinition("CMAKE_SYSTEM_VERSION"); if(this->PlatformName == "Itanium" || this->PlatformName == "x64") { if(this->IsExpressEdition() && !this->Find64BitTools(mf)) diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h index 9f154e9..dfdb649 100644 --- a/Source/cmGlobalVisualStudio10Generator.h +++ b/Source/cmGlobalVisualStudio10Generator.h @@ -99,6 +99,8 @@ protected: std::string GeneratorToolset; std::string DefaultPlatformToolset; + std::string SystemName; + std::string SystemVersion; bool ExpressEdition; bool MasmEnabled; |