diff options
| author | Patrick Gansterer <paroga@paroga.com> | 2012-11-19 17:11:17 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-11-19 19:10:30 (GMT) |
| commit | 8b62080c9db6a15649bd1673179076c096e26bec (patch) | |
| tree | 29571bce3028f3a9ffb532ae69227bee57786858 /Source/cmGlobalVisualStudio10Generator.cxx | |
| parent | 5bdf01184baa0301bd71f486b87d225f07cd80d0 (diff) | |
| download | CMake-8b62080c9db6a15649bd1673179076c096e26bec.zip CMake-8b62080c9db6a15649bd1673179076c096e26bec.tar.gz CMake-8b62080c9db6a15649bd1673179076c096e26bec.tar.bz2 | |
VS: Remove EnableLanguage from platform-specific generators
Move the logic into the base class to remove duplicated code.
Diffstat (limited to 'Source/cmGlobalVisualStudio10Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index b885223..db363bf 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -100,6 +100,14 @@ void cmGlobalVisualStudio10Generator ::EnableLanguage(std::vector<std::string>const & lang, cmMakefile *mf, bool optional) { + if(!strcmp(this->ArchitectureId, "Itanium") || + !strcmp(this->ArchitectureId, "x64")) + { + if(this->IsExpressEdition() && !this->Find64BitTools(mf)) + { + return; + } + } cmGlobalVisualStudio8Generator::EnableLanguage(lang, mf, optional); } |