diff options
| author | Brad King <brad.king@kitware.com> | 2022-12-16 13:55:12 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-12-16 13:55:22 (GMT) |
| commit | 9be0cdc22f8e696d3898446a53f4527c78ff2cbc (patch) | |
| tree | 29eebd44538560c776220476822d27ca02350d1f /Source | |
| parent | d293320228e1d64f2909b9a6e49d7744a2c500f7 (diff) | |
| parent | 64303b97438a15691c29e30a089a63c7447b6b21 (diff) | |
| download | CMake-9be0cdc22f8e696d3898446a53f4527c78ff2cbc.zip CMake-9be0cdc22f8e696d3898446a53f4527c78ff2cbc.tar.gz CMake-9be0cdc22f8e696d3898446a53f4527c78ff2cbc.tar.bz2 | |
Merge topic 'masm-debug-format'
64303b9743 ASM_MARMASM: Fix VS flag table entry for debug flag
5f8e4de696 ASM_MARMASM: Populate MSVC debug information format abstraction table
f62a0f53bf Merge branch 'backport-masm-debug-format' into masm-debug-format
a9bd1e34ef VS: Do not enable ASM_MASM debug information unless requested
98ba122a30 ASM_MASM: Populate MSVC debug information format abstraction table
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8022
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 4 |
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", |