Set a default BasePlatformToolset to allow the ICC buildbot to build.
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index cab9830..fc93347 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -11,8 +11,9 @@
<GenerateManifest Condition="'$(GenerateManifest)' == ''">false</GenerateManifest>
<EmbedManifest Condition="'$(EmbedManifest)' == ''">false</EmbedManifest>
<!-- For VS2008, we have to embed the manifest to be able to run -->
- <GenerateManifest Condition="'$(PlatformToolset)' == 'v90'">true</GenerateManifest>
- <EmbedManifest Condition="'$(PlatformToolset)' == 'v90'">true</EmbedManifest>
+ <!-- BasePlatformToolset is for ICC support -->
+ <GenerateManifest Condition="'$(PlatformToolset)' == 'v90' or '$(BasePlatformToolset)' == 'v90'">true</GenerateManifest>
+ <EmbedManifest Condition="'$(PlatformToolset)' == 'v90' or '$(BasePlatformToolset)' == 'v90'">true</EmbedManifest>
<SupportPGO Condition="'$(SupportPGO)' == ''">true</SupportPGO>
<SupportSigning Condition="'$(SupportSigning)' == ''">true</SupportSigning>
<SupportSigning Condition="'$(Configuration)' == 'Debug'">false</SupportSigning>
diff --git a/PCbuild/python.props b/PCbuild/python.props
index f7965c3..245e571 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -7,7 +7,10 @@
Use only MSVC 9.0, unless explicitly overridden
-->
<PlatformToolset Condition="'$(PlatformToolset)' == ''">v90</PlatformToolset>
-
+ <!--
+ Give a default for BasePlatformToolset as well, it's used by ICC and ignored otherwise
+ -->
+ <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(PlatformToolset)' != 'v90'">v90</BasePlatformToolset>
<!--
Convincing MSVC/MSBuild to prefer our platform names is too difficult,
so we define our own constant ArchName and use wherever we need it.