diff options
| author | Patrick Gansterer <paroga@paroga.com> | 2013-08-05 14:34:10 (GMT) |
|---|---|---|
| committer | Patrick Gansterer <paroga@paroga.com> | 2013-08-05 14:34:10 (GMT) |
| commit | 28e770cf6eb1be898e6904e85849f701ab71b5c1 (patch) | |
| tree | 712be4a3c284977bb5b29cb96b9332c036ab8333 /Source/cmGlobalVisualStudio10Generator.cxx | |
| parent | 1768014dfc8aee30430d57c8f984aad0abb15094 (diff) | |
| download | CMake-28e770cf6eb1be898e6904e85849f701ab71b5c1.zip CMake-28e770cf6eb1be898e6904e85849f701ab71b5c1.tar.gz CMake-28e770cf6eb1be898e6904e85849f701ab71b5c1.tar.bz2 | |
VS10: Add support for assembler code (#11536)
Use the masm BuildCustomizations, which are part of the Visual
Studio installation to allow compilation of asm files.
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 0837f99..9b14051 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); } |