kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VS: Save system name and version in global generator members 

Add to cmGlobalVisualStudio10Generator members for SystemName and
SystemVersion and populate them in SetSystemName.
This commit is contained in:
Brad King 2014-07-28 15:33:40 -04:00
parent f188845237
commit d0dd28fa92
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmGlobalVisualStudio10Generator.cxx
View File

@ -128,6 +128,8 @@ cmGlobalVisualStudio10Generator::SetGeneratorToolset(std::string const& ts,
bool cmGlobalVisualStudio10Generator::SetSystemName(std::string const& s, bool cmGlobalVisualStudio10Generator::SetSystemName(std::string const& s,
cmMakefile* mf) cmMakefile* mf)
{ {
this->SystemName = s;
this->SystemVersion = mf->GetSafeDefinition("CMAKE_SYSTEM_VERSION");
if(this->PlatformName == "Itanium" || this->PlatformName == "x64") if(this->PlatformName == "Itanium" || this->PlatformName == "x64")
{ {
if(this->IsExpressEdition() && !this->Find64BitTools(mf)) if(this->IsExpressEdition() && !this->Find64BitTools(mf))

2
Source/cmGlobalVisualStudio10Generator.h
View File

@ -99,6 +99,8 @@ protected:
std::string GeneratorToolset; std::string GeneratorToolset;
std::string DefaultPlatformToolset; std::string DefaultPlatformToolset;
std::string SystemName;
std::string SystemVersion;
bool ExpressEdition; bool ExpressEdition;
bool MasmEnabled; bool MasmEnabled;