summaryrefslogtreecommitdiffstats
path: root/Source/cmVisualStudio10TargetGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-12-15 16:55:09 (GMT)
committerBrad King <brad.king@kitware.com>2022-12-15 16:55:09 (GMT)
commitf62a0f53bf6858d9d5aae6249a89d6b1dca32bac (patch)
tree5db80c7fe6fd9a36977f04e4aef16eea9d1ede27 /Source/cmVisualStudio10TargetGenerator.cxx
parent26ab6691736d4db27a37162173054b14f86bae05 (diff)
parenta9bd1e34ef220c5467111dbe8703b39e85aa1f14 (diff)
downloadCMake-f62a0f53bf6858d9d5aae6249a89d6b1dca32bac.zip
CMake-f62a0f53bf6858d9d5aae6249a89d6b1dca32bac.tar.gz
CMake-f62a0f53bf6858d9d5aae6249a89d6b1dca32bac.tar.bz2
Merge branch 'backport-masm-debug-format' into masm-debug-format
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index f5396f4..1f45ce3 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -3859,6 +3859,10 @@ bool cmVisualStudio10TargetGenerator::ComputeMasmOptions(
this->LocalGenerator, Options::MasmCompiler, gg->GetMasmFlagTable());
Options& masmOptions = *pOptions;
+ // MSBuild enables debug information by default.
+ // Disable it explicitly unless a flag parsed below re-enables it.
+ masmOptions.AddFlag("GenerateDebugInformation", "false");
+
std::string flags;
this->LocalGenerator->AddLanguageFlags(flags, this->GeneratorTarget,
cmBuildStep::Compile, "ASM_MASM",