diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-12-21 00:09:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-21 00:09:44 +0200 |
| commit | a2528a881640913dfc71fab7f15225d7e7d9a567 (patch) | |
| tree | d4c90f6ae3a87624a4a7d7e90e48e2e700ee1d3f /mesonbuild/backend/vs2010backend.py | |
| parent | 39ab311019aed50c6baf3dcb2e1c1bfe0bbe15e8 (diff) | |
| parent | 139e020ede8a954a276e69d5c1921884ef9725ce (diff) | |
| download | meson-a2528a881640913dfc71fab7f15225d7e7d9a567.zip meson-a2528a881640913dfc71fab7f15225d7e7d9a567.tar.gz meson-a2528a881640913dfc71fab7f15225d7e7d9a567.tar.bz2 | |
Merge pull request #1233 from mesonbuild/wip/ignatenko/code-style
Trivial cleanups in code
Diffstat (limited to 'mesonbuild/backend/vs2010backend.py')
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index f3e9b4f..3ba63f4 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -14,7 +14,6 @@ import os, sys import pickle -import re import xml.dom.minidom import xml.etree.ElementTree as ET @@ -259,7 +258,7 @@ class Vs2010Backend(backends.Backend): ofile.write('\tEndGlobalSection\n') ofile.write('\tGlobalSection(ProjectConfigurationPlatforms) = ' 'postSolution\n') - ofile.write('\t\t{%s}.%s|%s.ActiveCfg = %s|%s\n' % + ofile.write('\t\t{%s}.%s|%s.ActiveCfg = %s|%s\n' % (self.environment.coredata.regen_guid, self.buildtype, self.platform, self.buildtype, self.platform)) ofile.write('\t\t{%s}.%s|%s.Build.0 = %s|%s\n' % @@ -734,7 +733,6 @@ class Vs2010Backend(backends.Backend): if len(target_args) > 0: target_args.append('%(AdditionalOptions)') ET.SubElement(clconf, "AdditionalOptions").text = ' '.join(target_args) - additional_options_set = True for d in target.include_dirs: for i in d.incdirs: @@ -930,7 +928,7 @@ class Vs2010Backend(backends.Backend): 'ToolsVersion' : '4.0', 'xmlns' : 'http://schemas.microsoft.com/developer/msbuild/2003'}) confitems = ET.SubElement(root, 'ItemGroup', {'Label' : 'ProjectConfigurations'}) - prjconf = ET.SubElement(confitems, 'ProjectConfiguration', + prjconf = ET.SubElement(confitems, 'ProjectConfiguration', {'Include' : self.buildtype + '|' + self.platform}) p = ET.SubElement(prjconf, 'Configuration') p.text= self.buildtype |