Skip to content

Commit b883701

Browse files
author
jeremyouellet
authored
Use Conditional PlatformToolset projects for VS (#261)
1 parent 6a01f3b commit b883701

File tree

2 files changed

+40
-8
lines changed

2 files changed

+40
-8
lines changed

‎windows/hidapi.vcxproj

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,40 @@
2626
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2727
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2828
<ConfigurationType>DynamicLibrary</ConfigurationType>
29-
<PlatformToolset>v140</PlatformToolset>
29+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='11'">v110</PlatformToolset>
30+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12'">v120</PlatformToolset>
31+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14'">v140</PlatformToolset>
32+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15'">v141</PlatformToolset>
33+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16'">v142</PlatformToolset>
3034
<CharacterSet>Unicode</CharacterSet>
3135
<WholeProgramOptimization>true</WholeProgramOptimization>
3236
</PropertyGroup>
3337
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
3438
<ConfigurationType>DynamicLibrary</ConfigurationType>
35-
<PlatformToolset>v140</PlatformToolset>
39+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='11'">v110</PlatformToolset>
40+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12'">v120</PlatformToolset>
41+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14'">v140</PlatformToolset>
42+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15'">v141</PlatformToolset>
43+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16'">v142</PlatformToolset>
3644
<CharacterSet>Unicode</CharacterSet>
3745
<WholeProgramOptimization>true</WholeProgramOptimization>
3846
</PropertyGroup>
3947
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4048
<ConfigurationType>DynamicLibrary</ConfigurationType>
41-
<PlatformToolset>v140</PlatformToolset>
49+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='11'">v110</PlatformToolset>
50+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12'">v120</PlatformToolset>
51+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14'">v140</PlatformToolset>
52+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15'">v141</PlatformToolset>
53+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16'">v142</PlatformToolset>
4254
<CharacterSet>Unicode</CharacterSet>
4355
</PropertyGroup>
4456
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4557
<ConfigurationType>DynamicLibrary</ConfigurationType>
46-
<PlatformToolset>v140</PlatformToolset>
58+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='11'">v110</PlatformToolset>
59+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12'">v120</PlatformToolset>
60+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14'">v140</PlatformToolset>
61+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15'">v141</PlatformToolset>
62+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16'">v142</PlatformToolset>
4763
<CharacterSet>Unicode</CharacterSet>
4864
</PropertyGroup>
4965
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

‎windows/hidtest.vcxproj

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,40 @@
2525
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2626
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2727
<ConfigurationType>Application</ConfigurationType>
28-
<PlatformToolset>v140</PlatformToolset>
28+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='11'">v110</PlatformToolset>
29+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12'">v120</PlatformToolset>
30+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14'">v140</PlatformToolset>
31+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15'">v141</PlatformToolset>
32+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16'">v142</PlatformToolset>
2933
<CharacterSet>MultiByte</CharacterSet>
3034
<WholeProgramOptimization>true</WholeProgramOptimization>
3135
</PropertyGroup>
3236
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
3337
<ConfigurationType>Application</ConfigurationType>
34-
<PlatformToolset>v140</PlatformToolset>
38+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='11'">v110</PlatformToolset>
39+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12'">v120</PlatformToolset>
40+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14'">v140</PlatformToolset>
41+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15'">v141</PlatformToolset>
42+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16'">v142</PlatformToolset>
3543
<CharacterSet>MultiByte</CharacterSet>
3644
<WholeProgramOptimization>true</WholeProgramOptimization>
3745
</PropertyGroup>
3846
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3947
<ConfigurationType>Application</ConfigurationType>
40-
<PlatformToolset>v140</PlatformToolset>
48+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='11'">v110</PlatformToolset>
49+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12'">v120</PlatformToolset>
50+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14'">v140</PlatformToolset>
51+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15'">v141</PlatformToolset>
52+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16'">v142</PlatformToolset>
4153
<CharacterSet>MultiByte</CharacterSet>
4254
</PropertyGroup>
4355
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4456
<ConfigurationType>Application</ConfigurationType>
45-
<PlatformToolset>v140</PlatformToolset>
57+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='11'">v110</PlatformToolset>
58+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12'">v120</PlatformToolset>
59+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14'">v140</PlatformToolset>
60+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='15'">v141</PlatformToolset>
61+
<PlatformToolset Condition="'$(VisualStudioVersion)'=='16'">v142</PlatformToolset>
4662
<CharacterSet>MultiByte</CharacterSet>
4763
</PropertyGroup>
4864
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

0 commit comments

Comments
 (0)