Skip to content

Commit 03718ba

Browse files
orenmneroorenmnero
authored
Can build with Visual Studio 2019 (v16) (quickfix#336)
1 parent 8ce1014 commit 03718ba

14 files changed

+3063
-6
lines changed

‎UnitTest++/UnitTest++_vs16.vcxproj

+173
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Release|Win32">
13+
<Configuration>Release</Configuration>
14+
<Platform>Win32</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<PropertyGroup Label="Globals">
22+
<ProjectGuid>{64A4FEFE-0461-4E95-8CC1-91EF5F57DBC6}</ProjectGuid>
23+
<RootNamespace>UnitTest</RootNamespace>
24+
<Keyword>Win32Proj</Keyword>
25+
<ProjectName>UnitTest++_vs16</ProjectName>
26+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
27+
</PropertyGroup>
28+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
29+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
30+
<ConfigurationType>StaticLibrary</ConfigurationType>
31+
<CharacterSet>Unicode</CharacterSet>
32+
<WholeProgramOptimization>false</WholeProgramOptimization>
33+
<PlatformToolset>v142</PlatformToolset>
34+
</PropertyGroup>
35+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
36+
<ConfigurationType>StaticLibrary</ConfigurationType>
37+
<CharacterSet>Unicode</CharacterSet>
38+
<WholeProgramOptimization>false</WholeProgramOptimization>
39+
<PlatformToolset>v142</PlatformToolset>
40+
</PropertyGroup>
41+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
42+
<ConfigurationType>StaticLibrary</ConfigurationType>
43+
<CharacterSet>Unicode</CharacterSet>
44+
<PlatformToolset>v142</PlatformToolset>
45+
</PropertyGroup>
46+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
47+
<ConfigurationType>StaticLibrary</ConfigurationType>
48+
<CharacterSet>Unicode</CharacterSet>
49+
<PlatformToolset>v142</PlatformToolset>
50+
</PropertyGroup>
51+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
52+
<ImportGroup Label="ExtensionSettings">
53+
</ImportGroup>
54+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
55+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
56+
</ImportGroup>
57+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
58+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
59+
</ImportGroup>
60+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
61+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
62+
</ImportGroup>
63+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
64+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
65+
</ImportGroup>
66+
<PropertyGroup Label="UserMacros" />
67+
<PropertyGroup>
68+
<_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
69+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)lib\debug\</OutDir>
70+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\$(ProjectName)\$(Configuration)\</IntDir>
71+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)lib\</OutDir>
72+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\$(ProjectName)\$(Configuration)\</IntDir>
73+
</PropertyGroup>
74+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
75+
<ClCompile>
76+
<Optimization>Disabled</Optimization>
77+
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
78+
<MinimalRebuild>true</MinimalRebuild>
79+
<ExceptionHandling>Async</ExceptionHandling>
80+
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
81+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
82+
<PrecompiledHeader>
83+
</PrecompiledHeader>
84+
<WarningLevel>Level4</WarningLevel>
85+
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
86+
</ClCompile>
87+
</ItemDefinitionGroup>
88+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
89+
<ClCompile>
90+
<Optimization>Disabled</Optimization>
91+
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
92+
<ExceptionHandling>Async</ExceptionHandling>
93+
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
94+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
95+
<PrecompiledHeader>
96+
</PrecompiledHeader>
97+
<WarningLevel>Level4</WarningLevel>
98+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
99+
</ClCompile>
100+
</ItemDefinitionGroup>
101+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
102+
<ClCompile>
103+
<Optimization>MinSpace</Optimization>
104+
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
105+
<ExceptionHandling>Async</ExceptionHandling>
106+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
107+
<PrecompiledHeader>
108+
</PrecompiledHeader>
109+
<WarningLevel>Level4</WarningLevel>
110+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
111+
</ClCompile>
112+
</ItemDefinitionGroup>
113+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
114+
<ClCompile>
115+
<Optimization>MinSpace</Optimization>
116+
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
117+
<ExceptionHandling>Async</ExceptionHandling>
118+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
119+
<PrecompiledHeader>
120+
</PrecompiledHeader>
121+
<WarningLevel>Level4</WarningLevel>
122+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
123+
</ClCompile>
124+
</ItemDefinitionGroup>
125+
<ItemGroup>
126+
<ClCompile Include="src\Win32\TimeHelpers.cpp" />
127+
<ClCompile Include="src\AssertException.cpp" />
128+
<ClCompile Include="src\Checks.cpp" />
129+
<ClCompile Include="src\CurrentTest.cpp" />
130+
<ClCompile Include="src\DeferredTestReporter.cpp" />
131+
<ClCompile Include="src\DeferredTestResult.cpp" />
132+
<ClCompile Include="src\MemoryOutStream.cpp" />
133+
<ClCompile Include="src\ReportAssert.cpp" />
134+
<ClCompile Include="src\Test.cpp" />
135+
<ClCompile Include="src\TestDetails.cpp" />
136+
<ClCompile Include="src\TestList.cpp" />
137+
<ClCompile Include="src\TestReporter.cpp" />
138+
<ClCompile Include="src\TestReporterStdout.cpp" />
139+
<ClCompile Include="src\TestResults.cpp" />
140+
<ClCompile Include="src\TestRunner.cpp" />
141+
<ClCompile Include="src\TimeConstraint.cpp" />
142+
<ClCompile Include="src\XmlTestReporter.cpp" />
143+
</ItemGroup>
144+
<ItemGroup>
145+
<ClInclude Include="src\Win32\TimeHelpers.h" />
146+
<ClInclude Include="src\AssertException.h" />
147+
<ClInclude Include="src\CheckMacros.h" />
148+
<ClInclude Include="src\Checks.h" />
149+
<ClInclude Include="src\Config.h" />
150+
<ClInclude Include="src\CurrentTest.h" />
151+
<ClInclude Include="src\DeferredTestReporter.h" />
152+
<ClInclude Include="src\DeferredTestResult.h" />
153+
<ClInclude Include="src\ExecuteTest.h" />
154+
<ClInclude Include="src\MemoryOutStream.h" />
155+
<ClInclude Include="src\ReportAssert.h" />
156+
<ClInclude Include="src\Test.h" />
157+
<ClInclude Include="src\TestDetails.h" />
158+
<ClInclude Include="src\TestList.h" />
159+
<ClInclude Include="src\TestMacros.h" />
160+
<ClInclude Include="src\TestReporter.h" />
161+
<ClInclude Include="src\TestReporterStdout.h" />
162+
<ClInclude Include="src\TestResults.h" />
163+
<ClInclude Include="src\TestRunner.h" />
164+
<ClInclude Include="src\TestSuite.h" />
165+
<ClInclude Include="src\TimeConstraint.h" />
166+
<ClInclude Include="src\TimeHelpers.h" />
167+
<ClInclude Include="src\UnitTest++.h" />
168+
<ClInclude Include="src\XmlTestReporter.h" />
169+
</ItemGroup>
170+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
171+
<ImportGroup Label="ExtensionTargets">
172+
</ImportGroup>
173+
</Project>

‎build_vs12.bat

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ set NET_VERSION=%3
66

77
if "%1" == "" set TARGET=Build
88
if "%2" == "" set CONFIGURATION=Release
9-
if "%3" == "" set NET_VERSION=v4.5
109

11-
set BUILD_CMD=MSBuild.exe quickfix_vs12.sln /t:%TARGET% /p:Configuration=%CONFIGURATION%;TargetFrameworkVersion=%NET_VERSION%
10+
set BUILD_CMD=MSBuild.exe quickfix_vs12.sln /t:%TARGET% /p:Configuration=%CONFIGURATION%
1211
echo Build command: %BUILD_CMD%
1312
%BUILD_CMD%

‎build_vs14.bat

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ set NET_VERSION=%3
66

77
if "%1" == "" set TARGET=Build
88
if "%2" == "" set CONFIGURATION=Release
9-
if "%3" == "" set NET_VERSION=v4.5
109

11-
set BUILD_CMD=MSBuild.exe quickfix_vs14.sln /t:%TARGET% /p:Configuration=%CONFIGURATION%;TargetFrameworkVersion=%NET_VERSION%
10+
set BUILD_CMD=MSBuild.exe quickfix_vs14.sln /t:%TARGET% /p:Configuration=%CONFIGURATION%
1211
echo Build command: %BUILD_CMD%
1312
%BUILD_CMD%

‎build_vs15.bat

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ set NET_VERSION=%3
66

77
if "%1" == "" set TARGET=Build
88
if "%2" == "" set CONFIGURATION=Release
9-
if "%3" == "" set NET_VERSION=v4.5
109

11-
set BUILD_CMD=MSBuild.exe quickfix_vs15.sln /t:%TARGET% /p:Configuration=%CONFIGURATION%;TargetFrameworkVersion=%NET_VERSION%
10+
set BUILD_CMD=MSBuild.exe quickfix_vs15.sln /t:%TARGET% /p:Configuration=%CONFIGURATION%
1211
echo Build command: %BUILD_CMD%
1312
%BUILD_CMD%

‎build_vs16.bat

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
echo off
2+
3+
set TARGET=%1
4+
set CONFIGURATION=%2
5+
set NET_VERSION=%3
6+
7+
if "%1" == "" set TARGET=Build
8+
if "%2" == "" set CONFIGURATION=Release
9+
10+
set BUILD_CMD=MSBuild.exe quickfix_vs16.sln /t:%TARGET% /p:Configuration=%CONFIGURATION%
11+
echo Build command: %BUILD_CMD%
12+
%BUILD_CMD%

0 commit comments

Comments
 (0)