Skip to content

Commit ae86536

Browse files
PKEuSPKEuS
committed
Updated to Visual Studio 2019
1 parent 65af02f commit ae86536

7 files changed

Lines changed: 33 additions & 28 deletions

File tree

‎cli/cli.vcxproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,56 +37,56 @@
3737
<PropertyGroup Label="Globals">
3838
<ProjectGuid>{35CBDF51-2456-3EC3-99ED-113C30858883}</ProjectGuid>
3939
<RootNamespace>cli</RootNamespace>
40-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
40+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
4141
</PropertyGroup>
4242
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
4343
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4444
<ConfigurationType>Application</ConfigurationType>
4545
<CharacterSet>Unicode</CharacterSet>
4646
<WholeProgramOptimization>false</WholeProgramOptimization>
47-
<PlatformToolset>v141</PlatformToolset>
47+
<PlatformToolset>v142</PlatformToolset>
4848
</PropertyGroup>
4949
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'" Label="Configuration">
5050
<ConfigurationType>Application</ConfigurationType>
5151
<CharacterSet>Unicode</CharacterSet>
5252
<WholeProgramOptimization>false</WholeProgramOptimization>
53-
<PlatformToolset>v141</PlatformToolset>
53+
<PlatformToolset>v142</PlatformToolset>
5454
</PropertyGroup>
5555
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5656
<ConfigurationType>Application</ConfigurationType>
5757
<CharacterSet>Unicode</CharacterSet>
5858
<WholeProgramOptimization>false</WholeProgramOptimization>
59-
<PlatformToolset>v141</PlatformToolset>
59+
<PlatformToolset>v142</PlatformToolset>
6060
</PropertyGroup>
6161
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'" Label="Configuration">
6262
<ConfigurationType>Application</ConfigurationType>
6363
<CharacterSet>Unicode</CharacterSet>
6464
<WholeProgramOptimization>false</WholeProgramOptimization>
65-
<PlatformToolset>v141</PlatformToolset>
65+
<PlatformToolset>v142</PlatformToolset>
6666
</PropertyGroup>
6767
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
6868
<ConfigurationType>Application</ConfigurationType>
6969
<CharacterSet>Unicode</CharacterSet>
7070
<WholeProgramOptimization>false</WholeProgramOptimization>
71-
<PlatformToolset>v141</PlatformToolset>
71+
<PlatformToolset>v142</PlatformToolset>
7272
</PropertyGroup>
7373
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'" Label="Configuration">
7474
<ConfigurationType>Application</ConfigurationType>
7575
<CharacterSet>Unicode</CharacterSet>
7676
<WholeProgramOptimization>false</WholeProgramOptimization>
77-
<PlatformToolset>v141</PlatformToolset>
77+
<PlatformToolset>v142</PlatformToolset>
7878
</PropertyGroup>
7979
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
8080
<ConfigurationType>Application</ConfigurationType>
8181
<CharacterSet>Unicode</CharacterSet>
8282
<WholeProgramOptimization>false</WholeProgramOptimization>
83-
<PlatformToolset>v141</PlatformToolset>
83+
<PlatformToolset>v142</PlatformToolset>
8484
</PropertyGroup>
8585
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'" Label="Configuration">
8686
<ConfigurationType>Application</ConfigurationType>
8787
<CharacterSet>Unicode</CharacterSet>
8888
<WholeProgramOptimization>false</WholeProgramOptimization>
89-
<PlatformToolset>v141</PlatformToolset>
89+
<PlatformToolset>v142</PlatformToolset>
9090
</PropertyGroup>
9191
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
9292
<ImportGroup Label="ExtensionSettings" />

‎cppcheck.sln‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.25914.0
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29020.237
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cli", "cli\cli.vcxproj", "{35CBDF51-2456-3EC3-99ED-113C30858883}"
77
ProjectSection(ProjectDependencies) = postProject

‎lib/cppcheck.vcxproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -157,56 +157,56 @@
157157
<PropertyGroup Label="Globals">
158158
<ProjectGuid>{C183DB5B-AD6C-423D-80CA-1F9549555A1A}</ProjectGuid>
159159
<RootNamespace>cppcheck_lib</RootNamespace>
160-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
160+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
161161
</PropertyGroup>
162162
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
163163
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
164164
<ConfigurationType>DynamicLibrary</ConfigurationType>
165165
<CharacterSet>Unicode</CharacterSet>
166166
<WholeProgramOptimization>false</WholeProgramOptimization>
167-
<PlatformToolset>v141</PlatformToolset>
167+
<PlatformToolset>v142</PlatformToolset>
168168
</PropertyGroup>
169169
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|Win32'" Label="Configuration">
170170
<ConfigurationType>DynamicLibrary</ConfigurationType>
171171
<CharacterSet>Unicode</CharacterSet>
172172
<WholeProgramOptimization>false</WholeProgramOptimization>
173-
<PlatformToolset>v141</PlatformToolset>
173+
<PlatformToolset>v142</PlatformToolset>
174174
</PropertyGroup>
175175
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
176176
<ConfigurationType>DynamicLibrary</ConfigurationType>
177177
<CharacterSet>Unicode</CharacterSet>
178178
<WholeProgramOptimization>false</WholeProgramOptimization>
179-
<PlatformToolset>v141</PlatformToolset>
179+
<PlatformToolset>v142</PlatformToolset>
180180
</PropertyGroup>
181181
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'" Label="Configuration">
182182
<ConfigurationType>DynamicLibrary</ConfigurationType>
183183
<CharacterSet>Unicode</CharacterSet>
184184
<WholeProgramOptimization>false</WholeProgramOptimization>
185-
<PlatformToolset>v141</PlatformToolset>
185+
<PlatformToolset>v142</PlatformToolset>
186186
</PropertyGroup>
187187
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
188188
<ConfigurationType>DynamicLibrary</ConfigurationType>
189189
<CharacterSet>Unicode</CharacterSet>
190190
<WholeProgramOptimization>false</WholeProgramOptimization>
191-
<PlatformToolset>v141</PlatformToolset>
191+
<PlatformToolset>v142</PlatformToolset>
192192
</PropertyGroup>
193193
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|Win32'" Label="Configuration">
194194
<ConfigurationType>DynamicLibrary</ConfigurationType>
195195
<CharacterSet>Unicode</CharacterSet>
196196
<WholeProgramOptimization>false</WholeProgramOptimization>
197-
<PlatformToolset>v141</PlatformToolset>
197+
<PlatformToolset>v142</PlatformToolset>
198198
</PropertyGroup>
199199
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
200200
<ConfigurationType>DynamicLibrary</ConfigurationType>
201201
<CharacterSet>Unicode</CharacterSet>
202202
<WholeProgramOptimization>false</WholeProgramOptimization>
203-
<PlatformToolset>v141</PlatformToolset>
203+
<PlatformToolset>v142</PlatformToolset>
204204
</PropertyGroup>
205205
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'" Label="Configuration">
206206
<ConfigurationType>DynamicLibrary</ConfigurationType>
207207
<CharacterSet>Unicode</CharacterSet>
208208
<WholeProgramOptimization>false</WholeProgramOptimization>
209-
<PlatformToolset>v141</PlatformToolset>
209+
<PlatformToolset>v142</PlatformToolset>
210210
</PropertyGroup>
211211
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
212212
<ImportGroup Label="ExtensionSettings" />

‎test/testrunner.vcxproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,32 +108,32 @@
108108
<PropertyGroup Label="Globals">
109109
<ProjectGuid>{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}</ProjectGuid>
110110
<RootNamespace>testrunner</RootNamespace>
111-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
111+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
112112
</PropertyGroup>
113113
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
114114
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
115115
<ConfigurationType>Application</ConfigurationType>
116116
<CharacterSet>Unicode</CharacterSet>
117117
<WholeProgramOptimization>false</WholeProgramOptimization>
118-
<PlatformToolset>v141</PlatformToolset>
118+
<PlatformToolset>v142</PlatformToolset>
119119
</PropertyGroup>
120120
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
121121
<ConfigurationType>Application</ConfigurationType>
122122
<CharacterSet>Unicode</CharacterSet>
123123
<WholeProgramOptimization>false</WholeProgramOptimization>
124-
<PlatformToolset>v141</PlatformToolset>
124+
<PlatformToolset>v142</PlatformToolset>
125125
</PropertyGroup>
126126
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
127127
<ConfigurationType>Application</ConfigurationType>
128128
<CharacterSet>Unicode</CharacterSet>
129129
<WholeProgramOptimization>false</WholeProgramOptimization>
130-
<PlatformToolset>v141</PlatformToolset>
130+
<PlatformToolset>v142</PlatformToolset>
131131
</PropertyGroup>
132132
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
133133
<ConfigurationType>Application</ConfigurationType>
134134
<CharacterSet>Unicode</CharacterSet>
135135
<WholeProgramOptimization>false</WholeProgramOptimization>
136-
<PlatformToolset>v141</PlatformToolset>
136+
<PlatformToolset>v142</PlatformToolset>
137137
</PropertyGroup>
138138
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
139139
<ImportGroup Label="ExtensionSettings" />

‎test/testrunner.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,9 @@
211211
<ClCompile Include="..\lib\astutils.cpp">
212212
<Filter>Source Files</Filter>
213213
</ClCompile>
214+
<ClCompile Include="testsimplifyusing.cpp">
215+
<Filter>Source Files</Filter>
216+
</ClCompile>
214217
</ItemGroup>
215218
<ItemGroup>
216219
<ClInclude Include="options.h">

‎win_installer/config.wxi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<?define QtDllDir = "..\bin" ?>
1010

1111
<?if $(var.Platform) = x64 ?>
12-
<?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC150_CRT_x64.msm" ?>
12+
<?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC142_CRT_x64.msm" ?>
1313
<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
1414
<?else?>
15-
<?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC150_CRT_x86.msm" ?>
15+
<?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC142_CRT_x86.msm" ?>
1616
<?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
1717
<?endif?>
1818
</Include>

‎win_installer/cppcheck.sln‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29020.237
5+
MinimumVisualStudioVersion = 10.0.40219.1
46
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "cppcheck", "cppcheck.wixproj", "{3B772885-4980-4A76-8407-4DABF8F7757C}"
57
EndProject
68
Global

0 commit comments

Comments
 (0)