From 4f6940df8c69053b4451056ebf3ebdc8f97bf356 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 7 Aug 2014 14:47:43 -0400 Subject: [PATCH] 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. --- Source/cmVisualStudio10TargetGenerator.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 3c7745d1c..9256b8955 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";