Skip to content

Commit e18dca1

Browse files
Mode-77Mode-77
committed
Updated MSVC project settings
* "AllTests" and "CppUTest" projects now output intermediary files and output libraries in their respective configuration/platform directories which help the msvc build system determine which files need recompiling. * Update build toolset
1 parent 7a3b3e0 commit e18dca1

File tree

2 files changed

+28
-18
lines changed

2 files changed

+28
-18
lines changed

‎CppUTest.vcxproj

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,32 @@
2020
</ItemGroup>
2121
<PropertyGroup Label="Globals">
2222
<ProjectGuid>{F468F539-27BD-468E-BE64-DDE641400B51}</ProjectGuid>
23+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2324
</PropertyGroup>
2425
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2526
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2627
<ConfigurationType>StaticLibrary</ConfigurationType>
2728
<UseOfMfc>false</UseOfMfc>
2829
<CharacterSet>MultiByte</CharacterSet>
30+
<PlatformToolset>v142</PlatformToolset>
2931
</PropertyGroup>
3032
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
3133
<ConfigurationType>StaticLibrary</ConfigurationType>
3234
<UseOfMfc>false</UseOfMfc>
3335
<CharacterSet>MultiByte</CharacterSet>
36+
<PlatformToolset>v142</PlatformToolset>
3437
</PropertyGroup>
3538
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3639
<ConfigurationType>StaticLibrary</ConfigurationType>
3740
<UseOfMfc>false</UseOfMfc>
3841
<CharacterSet>MultiByte</CharacterSet>
42+
<PlatformToolset>v142</PlatformToolset>
3943
</PropertyGroup>
4044
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4145
<ConfigurationType>StaticLibrary</ConfigurationType>
4246
<UseOfMfc>false</UseOfMfc>
4347
<CharacterSet>MultiByte</CharacterSet>
48+
<PlatformToolset>v142</PlatformToolset>
4449
</PropertyGroup>
4550
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4651
<ImportGroup Label="ExtensionSettings">
@@ -60,14 +65,14 @@
6065
<PropertyGroup Label="UserMacros" />
6166
<PropertyGroup>
6267
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
63-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\</OutDir>
64-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">lib\</OutDir>
65-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cpputest_build\Debug\$(ProjectName)\</IntDir>
66-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cpputest_build\Debug\$(ProjectName)\</IntDir>
67-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\</OutDir>
68-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">lib\</OutDir>
69-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cpputest_build\Release\$(ProjectName)\</IntDir>
70-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cpputest_build\Release\$(ProjectName)\</IntDir>
68+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\x86\</OutDir>
69+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">lib\x64\</OutDir>
70+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cpputest_build\Debug\x86\$(ProjectName)\</IntDir>
71+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cpputest_build\Debug\x64\$(ProjectName)\</IntDir>
72+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\x86\</OutDir>
73+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">lib\x64\</OutDir>
74+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cpputest_build\Release\x86\$(ProjectName)\</IntDir>
75+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cpputest_build\Release\x64\$(ProjectName)\</IntDir>
7176
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)d</TargetName>
7277
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)d</TargetName>
7378
</PropertyGroup>
@@ -295,4 +300,4 @@
295300
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
296301
<ImportGroup Label="ExtensionTargets">
297302
</ImportGroup>
298-
</Project>
303+
</Project>

‎tests/AllTests.vcxproj

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,32 @@
2020
</ItemGroup>
2121
<PropertyGroup Label="Globals">
2222
<ProjectGuid>{913088F6-37C0-4195-80E9-548C7C5303CB}</ProjectGuid>
23+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2324
</PropertyGroup>
2425
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2526
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2627
<ConfigurationType>Application</ConfigurationType>
2728
<UseOfMfc>false</UseOfMfc>
2829
<CharacterSet>MultiByte</CharacterSet>
30+
<PlatformToolset>v142</PlatformToolset>
2931
</PropertyGroup>
3032
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3133
<ConfigurationType>Application</ConfigurationType>
3234
<UseOfMfc>false</UseOfMfc>
3335
<CharacterSet>MultiByte</CharacterSet>
36+
<PlatformToolset>v142</PlatformToolset>
3437
</PropertyGroup>
3538
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3639
<ConfigurationType>Application</ConfigurationType>
3740
<UseOfMfc>false</UseOfMfc>
3841
<CharacterSet>MultiByte</CharacterSet>
42+
<PlatformToolset>v142</PlatformToolset>
3943
</PropertyGroup>
4044
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4145
<ConfigurationType>Application</ConfigurationType>
4246
<UseOfMfc>false</UseOfMfc>
4347
<CharacterSet>MultiByte</CharacterSet>
48+
<PlatformToolset>v142</PlatformToolset>
4449
</PropertyGroup>
4550
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4651
<ImportGroup Label="ExtensionSettings">
@@ -64,16 +69,16 @@
6469
<PropertyGroup Label="UserMacros" />
6570
<PropertyGroup>
6671
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
67-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\cpputest_build\</OutDir>
68-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\cpputest_build\</OutDir>
69-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\cpputest_build\Release\$(ProjectName)\</IntDir>
70-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\cpputest_build\Release\$(ProjectName)\</IntDir>
72+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\cpputest_build\x86\</OutDir>
73+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\cpputest_build\x64\</OutDir>
74+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\cpputest_build\Release\x86\$(ProjectName)\</IntDir>
75+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\cpputest_build\Release\x64\$(ProjectName)\</IntDir>
7176
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
7277
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
73-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\cpputest_build\</OutDir>
74-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\cpputest_build\</OutDir>
75-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\cpputest_build\Debug\$(ProjectName)\</IntDir>
76-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\cpputest_build\Debug\$(ProjectName)\</IntDir>
78+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\cpputest_build\x86\</OutDir>
79+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\cpputest_build\x64\</OutDir>
80+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\cpputest_build\Debug\x86\$(ProjectName)\</IntDir>
81+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\cpputest_build\Debug\x64\$(ProjectName)\</IntDir>
7782
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
7883
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
7984
</PropertyGroup>
@@ -319,4 +324,4 @@
319324
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
320325
<ImportGroup Label="ExtensionTargets">
321326
</ImportGroup>
322-
</Project>
327+
</Project>

0 commit comments

Comments
 (0)