From 1cc0dc154080f27fbe194ae909a57d83600cf295 Mon Sep 17 00:00:00 2001 From: Bug Date: Wed, 7 Jun 2017 23:16:23 -0600 Subject: fix WarningLevel in vcxproj #1913 - VS 2010-2015 expect to be inside - WarningLevel now correctly reflects VisualStudioCCompiler.get_warn_args --- mesonbuild/backend/vs2010backend.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mesonbuild/backend') diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 082f3c5..fafde8f 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -706,9 +706,6 @@ class Vs2010Backend(backends.Backend): ET.SubElement(type_config, 'Optimization').text = 'MinSpace' elif '/Od' in o_flags: ET.SubElement(type_config, 'Optimization').text = 'Disabled' - # Warning level - warning_level = self.get_option_for_target('warning_level', target) - ET.SubElement(type_config, 'WarningLevel').text = 'Level' + warning_level # End configuration ET.SubElement(root, 'Import', Project='$(VCTargetsPath)\Microsoft.Cpp.props') generated_files, custom_target_output_files, generated_files_include_dirs = self.generate_custom_generator_commands(target, root) @@ -862,6 +859,9 @@ class Vs2010Backend(backends.Backend): ET.SubElement(clconf, 'MinimalRebuild').text = 'true' ET.SubElement(clconf, 'FunctionLevelLinking').text = 'true' pch_node = ET.SubElement(clconf, 'PrecompiledHeader') + # Warning level + warning_level = self.get_option_for_target('warning_level', target) + ET.SubElement(clconf, 'WarningLevel').text = 'Level' + str(1 + int(warning_level)) if self.get_option_for_target('werror', target): ET.SubElement(clconf, 'TreatWarningAsError').text = 'true' # Note: SuppressStartupBanner is /NOLOGO and is 'true' by default -- cgit v1.1