Skip to content

Commit 50611e7

Browse files
committed
aligned all options between the various Visual Studio configurations
also fixed invalid standard setting in `Debug-PCRE` configuration for `cppcheck` causing build failures with SmallVector
1 parent d281e40 commit 50611e7

3 files changed

Lines changed: 41 additions & 27 deletions

File tree

cli/cli.vcxproj

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
<BufferSecurityCheck>true</BufferSecurityCheck>
161161
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
162162
<Optimization>Disabled</Optimization>
163-
<PreprocessorDefinitions>CPPCHECKLIB_IMPORT;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
163+
<PreprocessorDefinitions>CPPCHECKLIB_IMPORT;TINYXML2_IMPORT;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
164164
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
165165
<WarningLevel>Level4</WarningLevel>
166166
<DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805</DisableSpecificWarnings>
@@ -175,7 +175,7 @@
175175
<GenerateDebugInformation>true</GenerateDebugInformation>
176176
<SubSystem>Console</SubSystem>
177177
<SuppressStartupBanner>true</SuppressStartupBanner>
178-
<ProgramDatabaseFile>$(TargetDir)cli.pdb</ProgramDatabaseFile>
178+
<ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
179179
<LargeAddressAware>true</LargeAddressAware>
180180
<StackReserveSize>8000000</StackReserveSize>
181181
<StackCommitSize>8000000</StackCommitSize>
@@ -214,7 +214,7 @@
214214
<BufferSecurityCheck>true</BufferSecurityCheck>
215215
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
216216
<Optimization>Disabled</Optimization>
217-
<PreprocessorDefinitions>CPPCHECKLIB_IMPORT;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
217+
<PreprocessorDefinitions>CPPCHECKLIB_IMPORT;TINYXML2_IMPORT;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
218218
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
219219
<WarningLevel>Level4</WarningLevel>
220220
<DisableSpecificWarnings>4018;4127;4146;4244;4251;4267;4389;4482;4512;4701;4706;4800;4805</DisableSpecificWarnings>
@@ -231,6 +231,7 @@
231231
<SuppressStartupBanner>true</SuppressStartupBanner>
232232
<StackReserveSize>8000000</StackReserveSize>
233233
<StackCommitSize>8000000</StackCommitSize>
234+
<LargeAddressAware>true</LargeAddressAware>
234235
</Link>
235236
</ItemDefinitionGroup>
236237
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">
@@ -256,14 +257,15 @@
256257
<SuppressStartupBanner>true</SuppressStartupBanner>
257258
<StackReserveSize>8000000</StackReserveSize>
258259
<StackCommitSize>8000000</StackCommitSize>
260+
<LargeAddressAware>true</LargeAddressAware>
259261
</Link>
260262
</ItemDefinitionGroup>
261263
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
262264
<ClCompile>
263265
<AdditionalIncludeDirectories>..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
264266
<BufferSecurityCheck>false</BufferSecurityCheck>
265267
<Optimization>MaxSpeed</Optimization>
266-
<PreprocessorDefinitions>CPPCHECKLIB_IMPORT;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
268+
<PreprocessorDefinitions>CPPCHECKLIB_IMPORT;TINYXML2_IMPORT;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
267269
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
268270
<WarningLevel>Level4</WarningLevel>
269271
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
@@ -277,11 +279,12 @@
277279
<AdditionalOptions>/Zc:throwingNew /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
278280
<EnforceTypeConversionRules>true</EnforceTypeConversionRules>
279281
<LanguageStandard>stdcpp14</LanguageStandard>
282+
<FunctionLevelLinking>true</FunctionLevelLinking>
280283
</ClCompile>
281284
<Link>
282285
<AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
283286
<AdditionalLibraryDirectories>../externals;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
284-
<GenerateDebugInformation>false</GenerateDebugInformation>
287+
<GenerateDebugInformation>true</GenerateDebugInformation>
285288
<SubSystem>Console</SubSystem>
286289
<SuppressStartupBanner>true</SuppressStartupBanner>
287290
<OptimizeReferences>true</OptimizeReferences>
@@ -311,11 +314,12 @@
311314
<AdditionalOptions>/Zc:throwingNew /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
312315
<EnforceTypeConversionRules>true</EnforceTypeConversionRules>
313316
<LanguageStandard>stdcpp14</LanguageStandard>
317+
<FunctionLevelLinking>true</FunctionLevelLinking>
314318
</ClCompile>
315319
<Link>
316320
<AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
317321
<AdditionalLibraryDirectories>../externals;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
318-
<GenerateDebugInformation>false</GenerateDebugInformation>
322+
<GenerateDebugInformation>true</GenerateDebugInformation>
319323
<SubSystem>Console</SubSystem>
320324
<SuppressStartupBanner>true</SuppressStartupBanner>
321325
<OptimizeReferences>true</OptimizeReferences>
@@ -331,7 +335,7 @@
331335
<AdditionalIncludeDirectories>..\lib;..\externals;..\externals\simplecpp;..\externals\tinyxml2;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
332336
<BufferSecurityCheck>false</BufferSecurityCheck>
333337
<Optimization>MaxSpeed</Optimization>
334-
<PreprocessorDefinitions>CPPCHECKLIB_IMPORT;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
338+
<PreprocessorDefinitions>CPPCHECKLIB_IMPORT;TINYXML2_IMPORT;NDEBUG;WIN32;_CRT_SECURE_NO_WARNINGS;WIN32_LEAN_AND_MEAN;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
335339
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
336340
<WarningLevel>Level4</WarningLevel>
337341
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
@@ -358,6 +362,7 @@
358362
<SetChecksum>true</SetChecksum>
359363
<StackReserveSize>8000000</StackReserveSize>
360364
<StackCommitSize>8000000</StackCommitSize>
365+
<LargeAddressAware>true</LargeAddressAware>
361366
</Link>
362367
</ItemDefinitionGroup>
363368
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'">
@@ -384,14 +389,15 @@
384389
<Link>
385390
<AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
386391
<AdditionalLibraryDirectories>../externals;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
387-
<GenerateDebugInformation>false</GenerateDebugInformation>
392+
<GenerateDebugInformation>true</GenerateDebugInformation>
388393
<SubSystem>Console</SubSystem>
389394
<SuppressStartupBanner>true</SuppressStartupBanner>
390395
<OptimizeReferences>true</OptimizeReferences>
391396
<EnableCOMDATFolding>true</EnableCOMDATFolding>
392397
<SetChecksum>true</SetChecksum>
393398
<StackReserveSize>8000000</StackReserveSize>
394399
<StackCommitSize>8000000</StackCommitSize>
400+
<LargeAddressAware>true</LargeAddressAware>
395401
</Link>
396402
</ItemDefinitionGroup>
397403
<ItemGroup>

0 commit comments

Comments
 (0)