diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-09-06 17:01:38 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-06 17:01:38 (GMT) |
| commit | 5fcd5e64eec9ed67613b8fe7356fb8288151ceba (patch) | |
| tree | 7f439fe482a133d7877977a255d518a5ee846024 /PCbuild/python.props | |
| parent | bcaac8188b1a1e67d2cc155609f0f883f036df33 (diff) | |
| download | cpython-5fcd5e64eec9ed67613b8fe7356fb8288151ceba.zip cpython-5fcd5e64eec9ed67613b8fe7356fb8288151ceba.tar.gz cpython-5fcd5e64eec9ed67613b8fe7356fb8288151ceba.tar.bz2 | |
bpo-31340: Change to building with MSVC v141 (included with Visual Studio 2017) (#3311)
Diffstat (limited to 'PCbuild/python.props')
| -rw-r--r-- | PCbuild/python.props | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/PCbuild/python.props b/PCbuild/python.props index c81cd94..c2baebc 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -10,6 +10,7 @@ We set BasePlatformToolset for ICC's benefit, it's otherwise ignored. --> + <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and ('$(MSBuildToolsVersion)' == '15.0' or '$(VisualStudioVersion)' == '15.0')">v141</BasePlatformToolset> <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(VCTargetsPath14)' != ''">v140</BasePlatformToolset> <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(VCTargetsPath12)' != ''">v120</BasePlatformToolset> <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(VCTargetsPath11)' != ''">v110</BasePlatformToolset> @@ -39,6 +40,7 @@ <BuildPath Condition="'$(ArchName)' == 'amd64'">$(BuildPath64)</BuildPath> <BuildPath Condition="'$(BuildPath)' == ''">$(PySourcePath)PCBuild\$(ArchName)\</BuildPath> <BuildPath Condition="!HasTrailingSlash($(BuildPath))">$(BuildPath)\</BuildPath> + <BuildPath Condition="$(Configuration) == 'PGInstrument'">$(BuildPath)instrumented\</BuildPath> <!-- Directories of external projects. tcltk is handled in tcltk.props --> <ExternalsDir>$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals\`))</ExternalsDir> |