diff options
| author | Andres Freund <andres@anarazel.de> | 2021-10-06 20:18:35 -0700 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2021-10-08 09:16:19 -0700 |
| commit | 157f11dc9eb3977736f8755ee455f3d1410a8768 (patch) | |
| tree | 2c7266b9faf494ca84c3d57373ff3ae303500999 /mesonbuild/backend | |
| parent | 3f8c78b3172cfc78762cb0bf294c5aaafc18ca44 (diff) | |
| download | meson-157f11dc9eb3977736f8755ee455f3d1410a8768.zip meson-157f11dc9eb3977736f8755ee455f3d1410a8768.tar.gz meson-157f11dc9eb3977736f8755ee455f3d1410a8768.tar.bz2 | |
backend/vs: Move Microsoft.Cpp.props to before ItemDefinitionGroup.
The main reason for this move is to make it easier to merge the copies of
project generation. But as far as I can tell, the Microsoft.Cpp.props import
also belongs before the ItemDefinitionGroup.
Originally the order seems to have been that way, but 431a9ea664 changed it in
the course of other changes.
Diffstat (limited to 'mesonbuild/backend')
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 4cf6a5f..4c39bd7 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -867,6 +867,9 @@ class Vs2010Backend(backends.Backend): if '/INCREMENTAL:NO' in buildtype_link_args: ET.SubElement(type_config, 'LinkIncremental').text = 'false' + # End configuration (but note we add further to type_config, below) + ET.SubElement(root, 'Import', Project=r'$(VCTargetsPath)\Microsoft.Cpp.props') + # Build information compiles = ET.SubElement(root, 'ItemDefinitionGroup') clconf = ET.SubElement(compiles, 'ClCompile') @@ -930,8 +933,6 @@ class Vs2010Backend(backends.Backend): ET.SubElement(clconf, 'ExceptionHandling').text = 'false' else: # 'sc' or 'default' ET.SubElement(clconf, 'ExceptionHandling').text = 'Sync' - # 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) (gen_src, gen_hdrs, gen_objs, gen_langs) = self.split_sources(generated_files) (custom_src, custom_hdrs, custom_objs, custom_langs) = self.split_sources(custom_target_output_files) |