File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1111 <GenerateManifest Condition =" '$(GenerateManifest)' == ''" >false</GenerateManifest >
1212 <EmbedManifest Condition =" '$(EmbedManifest)' == ''" >false</EmbedManifest >
1313 <!-- For VS2008, we have to embed the manifest to be able to run -->
14- <GenerateManifest Condition =" '$(PlatformToolset)' == 'v90'" >true</GenerateManifest >
15- <EmbedManifest Condition =" '$(PlatformToolset)' == 'v90'" >true</EmbedManifest >
14+ <!-- BasePlatformToolset is for ICC support -->
15+ <GenerateManifest Condition =" '$(PlatformToolset)' == 'v90' or '$(BasePlatformToolset)' == 'v90'" >true</GenerateManifest >
16+ <EmbedManifest Condition =" '$(PlatformToolset)' == 'v90' or '$(BasePlatformToolset)' == 'v90'" >true</EmbedManifest >
1617 <SupportPGO Condition =" '$(SupportPGO)' == ''" >true</SupportPGO >
1718 <SupportSigning Condition =" '$(SupportSigning)' == ''" >true</SupportSigning >
1819 <SupportSigning Condition =" '$(Configuration)' == 'Debug'" >false</SupportSigning >
Original file line number Diff line number Diff line change 77 Use only MSVC 9.0, unless explicitly overridden
88 -->
99 <PlatformToolset Condition =" '$(PlatformToolset)' == ''" >v90</PlatformToolset >
10-
10+ <!--
11+ Give a default for BasePlatformToolset as well, it's used by ICC and ignored otherwise
12+ -->
13+ <BasePlatformToolset Condition =" '$(BasePlatformToolset)' == '' and '$(PlatformToolset)' != 'v90'" >v90</BasePlatformToolset >
1114 <!--
1215 Convincing MSVC/MSBuild to prefer our platform names is too difficult,
1316 so we define our own constant ArchName and use wherever we need it.
You can’t perform that action at this time.
0 commit comments