From d0dd28fa92cb2223e20f3586b8973a931aa61dac Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 28 Jul 2014 15:33:40 -0400 Subject: [PATCH] VS: Save system name and version in global generator members Add to cmGlobalVisualStudio10Generator members for SystemName and SystemVersion and populate them in SetSystemName. --- Source/cmGlobalVisualStudio10Generator.cxx | 2 ++ Source/cmGlobalVisualStudio10Generator.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index c1b087a94..ad74537b6 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 9f154e94f..dfdb6494f 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;