diff options
| author | Brad King <brad.king@kitware.com> | 2013-08-06 20:55:10 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-08-06 20:55:10 (GMT) |
| commit | 1ed726a46c11ac3b9836b210584cd90e91ae3174 (patch) | |
| tree | c079c32017d51b78014001c7bb4d8add21ad8740 /Source/cmGlobalVisualStudio10Generator.cxx | |
| parent | dba225db334a89aae3835d98f200bb1ce3eb8753 (diff) | |
| parent | 28e770cf6eb1be898e6904e85849f701ab71b5c1 (diff) | |
| download | CMake-1ed726a46c11ac3b9836b210584cd90e91ae3174.zip CMake-1ed726a46c11ac3b9836b210584cd90e91ae3174.tar.gz CMake-1ed726a46c11ac3b9836b210584cd90e91ae3174.tar.bz2 | |
Merge topic 'vs-masm'
28e770c VS10: Add support for assembler code (#11536)
Diffstat (limited to 'Source/cmGlobalVisualStudio10Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.cxx | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index 5643d9e..b2a337c 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -79,6 +79,7 @@ cmGlobalVisualStudio10Generator::cmGlobalVisualStudio10Generator( this->ExpressEdition = cmSystemTools::ReadRegistryValue( "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\10.0\\Setup\\VC;" "ProductDir", vc10Express, cmSystemTools::KeyWOW64_32); + this->MasmEnabled = false; } //---------------------------------------------------------------------------- @@ -168,6 +169,16 @@ void cmGlobalVisualStudio10Generator return; } } + + for(std::vector<std::string>::const_iterator it = lang.begin(); + it != lang.end(); ++it) + { + if(*it == "ASM_MASM") + { + this->MasmEnabled = true; + } + } + cmGlobalVisualStudio8Generator::EnableLanguage(lang, mf, optional); } |