diff options
| author | Peter Harris <pharris@opentext.com> | 2020-03-30 14:44:38 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-04-03 00:52:40 +0300 |
| commit | d84daf3e95742910a0e3165c479c0726dcbb40ef (patch) | |
| tree | af099688d09993df8e73d75804cdeb29a28983c0 | |
| parent | 30ba9cca72da5be2ef5c620307735d219d6298b5 (diff) | |
| download | meson-d84daf3e95742910a0e3165c479c0726dcbb40ef.zip meson-d84daf3e95742910a0e3165c479c0726dcbb40ef.tar.gz meson-d84daf3e95742910a0e3165c479c0726dcbb40ef.tar.bz2 | |
backend/vs: Fix debug information and runtime checks
Both DebugInformationFormat and BasicRuntimeChecks need to be in clconf
(not type_config) for Visual Studio to recognize them.
Fixes #6699
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 177e715..8ae90b7 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -844,18 +844,18 @@ class Vs2010Backend(backends.Backend): ET.SubElement(clconf, 'RuntimeLibrary').text = 'MultiThreadedDLL' # Debug format if '/ZI' in buildtype_args: - ET.SubElement(type_config, 'DebugInformationFormat').text = 'EditAndContinue' + ET.SubElement(clconf, 'DebugInformationFormat').text = 'EditAndContinue' elif '/Zi' in buildtype_args: - ET.SubElement(type_config, 'DebugInformationFormat').text = 'ProgramDatabase' + ET.SubElement(clconf, 'DebugInformationFormat').text = 'ProgramDatabase' elif '/Z7' in buildtype_args: - ET.SubElement(type_config, 'DebugInformationFormat').text = 'OldStyle' + ET.SubElement(clconf, 'DebugInformationFormat').text = 'OldStyle' # Runtime checks if '/RTC1' in buildtype_args: - ET.SubElement(type_config, 'BasicRuntimeChecks').text = 'EnableFastChecks' + ET.SubElement(clconf, 'BasicRuntimeChecks').text = 'EnableFastChecks' elif '/RTCu' in buildtype_args: - ET.SubElement(type_config, 'BasicRuntimeChecks').text = 'UninitializedLocalUsageCheck' + ET.SubElement(clconf, 'BasicRuntimeChecks').text = 'UninitializedLocalUsageCheck' elif '/RTCs' in buildtype_args: - ET.SubElement(type_config, 'BasicRuntimeChecks').text = 'StackFrameRuntimeCheck' + ET.SubElement(clconf, 'BasicRuntimeChecks').text = 'StackFrameRuntimeCheck' # End configuration ET.SubElement(root, 'Import', Project=r'$(VCTargetsPath)\Microsoft.Cpp.props') generated_files, custom_target_output_files, generated_files_include_dirs = self.generate_custom_generator_commands(target, root) |