Enabling PreFast to find virtual/override issues, some better organization of files

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-09-07 16:11:48 -07:00
parent aad2c214a4
commit 6b13e8bfc8
7 changed files with 15 additions and 5 deletions
+1 -1
View File
@@ -228,7 +228,7 @@ function(ly_add_test)
# For test projects that are custom targets, pass a props file that sets the project as "Console" so
# it leaves the console open when it finishes
set_target_properties(${unaliased_test_name} PROPERTIES VS_USER_PROPS "${LY_ROOT_FOLDER}/cmake/Platform/Common/TestProject.props")
set_target_properties(${unaliased_test_name} PROPERTIES VS_USER_PROPS "${LY_ROOT_FOLDER}/cmake/Platform/Common/MSVC/TestProject.props")
# Include additional dependencies
if (ly_add_test_RUNTIME_DEPENDENCIES)
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<RuleSet Name="O3DE's CodeAnalysis Rule Set" Description=" " ToolsVersion="17.0">
<Rules AnalyzerId="Microsoft.Analyzers.NativeCodeAnalysis" RuleNamespace="Microsoft.Rules.Native">
<Rule Id="C26433" Action="Error" />
<Rule Id="C26435" Action="Error" />
</Rules>
</RuleSet>
@@ -13,7 +13,7 @@ endif()
unset(minimum_supported_toolset)
include(cmake/Platform/Common/Configurations_common.cmake)
include(cmake/Platform/Common/VisualStudio_common.cmake)
include(cmake/Platform/Common/MSVC/VisualStudio_common.cmake)
# Verify that it wasn't invoked with an unsupported target/host architecture. Currently only supports x64/x64
if(CMAKE_VS_PLATFORM_NAME AND NOT CMAKE_VS_PLATFORM_NAME STREQUAL "x64")
@@ -14,6 +14,7 @@ SPDX-License-Identifier: Apache-2.0 OR MIT
@VCPKG_CONFIGURATION_MAPPING@
<!-- Disable vcpkg to prevent include and linking paths from being added by the vcpkg integration -->
<VcpkgEnabled>false</VcpkgEnabled>
<CodeAnalysisRuleSet>@LY_ROOT_FOLDER@\cmake\Platform\Common\MSVC\CodeAnalysis.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
@@ -25,4 +26,4 @@ SPDX-License-Identifier: Apache-2.0 OR MIT
</ItemDefinitionGroup>
<!-- Continue scanning upwards to pick up all Directory.Build.props -->
<Import Condition="'@scan_above_directory_build_props@' != ''" Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
</Project>
</Project>
@@ -7,10 +7,12 @@
#
set(FILES
../Common/Directory.Build.props
../Common/VisualStudio_common.cmake
../Common/Configurations_common.cmake
../Common/MSVC/Configurations_msvc.cmake
../Common/MSVC/CodeAnalysis.ruleset
../Common/MSVC/Directory.Build.props
../Common/MSVC/TestProject.props
../Common/MSVC/VisualStudio_common.cmake
../Common/Install_common.cmake
../Common/LYWrappers_default.cmake
../Common/TargetIncludeSystemDirectories_unsupported.cmake