diff options
| author | Brad King <brad.king@kitware.com> | 2014-08-07 18:47:43 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-08-13 18:47:56 (GMT) |
| commit | 4f6940df8c69053b4451056ebf3ebdc8f97bf356 (patch) | |
| tree | ab9579efe424407547c0f13807ab62e85e873db0 /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | d7866c52c9fc7f28990337a965e8d9e6652b0ac5 (diff) | |
| download | CMake-4f6940df8c69053b4451056ebf3ebdc8f97bf356.zip CMake-4f6940df8c69053b4451056ebf3ebdc8f97bf356.tar.gz CMake-4f6940df8c69053b4451056ebf3ebdc8f97bf356.tar.bz2 | |
VS: Fix ASM_MASM support in VS >= 10
Fix a typo introduced by commit ce511435 (stringapi: Use strings for the
languages, 2014-02-03) to check the language name correctly.
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 3c7745d..9256b89 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1123,7 +1123,7 @@ void cmVisualStudio10TargetGenerator::WriteAllSources() { tool = "ClCompile"; } - else if (lang == "ASM_NASM" && + else if (lang == "ASM_MASM" && this->GlobalGenerator->IsMasmEnabled()) { tool = "MASM"; |