diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-29 12:52:24 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-07-29 12:52:24 (GMT) |
| commit | 38065563b6fb0093004d0c89b5de0f82a76b5a31 (patch) | |
| tree | 96b92f00a70fbb541edfa1edfb963f61312e9f75 /Source/cmGlobalVisualStudio10Generator.cxx | |
| parent | 104a4cb783b7381452c3eff8bdefe8c985079f2e (diff) | |
| parent | e58f97531aa6e2a124540f38b5acd18fd989cf3b (diff) | |
| download | CMake-38065563b6fb0093004d0c89b5de0f82a76b5a31.zip CMake-38065563b6fb0093004d0c89b5de0f82a76b5a31.tar.gz CMake-38065563b6fb0093004d0c89b5de0f82a76b5a31.tar.bz2 | |
Merge topic 'vs10-system-hook'
e58f9753 VS: Add a hook to adapt to SystemName and SystemVersion
d0dd28fa VS: Save system name and version in global generator members
Diffstat (limited to 'Source/cmGlobalVisualStudio10Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.cxx | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index 80fd9f0..4007789 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -128,6 +128,12 @@ 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->InitializeSystem(mf)) + { + return false; + } if(this->PlatformName == "Itanium" || this->PlatformName == "x64") { if(this->IsExpressEdition() && !this->Find64BitTools(mf)) @@ -140,6 +146,12 @@ bool cmGlobalVisualStudio10Generator::SetSystemName(std::string const& s, } //---------------------------------------------------------------------------- +bool cmGlobalVisualStudio10Generator::InitializeSystem(cmMakefile*) +{ + return true; +} + +//---------------------------------------------------------------------------- void cmGlobalVisualStudio10Generator ::AddVSPlatformToolsetDefinition(cmMakefile* mf) const { |