diff --git a/cmake/Platform/Common/Clang/Configurations_clang.cmake b/cmake/Platform/Common/Clang/Configurations_clang.cmake index 86f4faccfb..2a311d6079 100644 --- a/cmake/Platform/Common/Clang/Configurations_clang.cmake +++ b/cmake/Platform/Common/Clang/Configurations_clang.cmake @@ -20,7 +20,7 @@ ly_append_configurations_options( # Disabled warnings (please do not disable any others without first consulting sig-build) ################### -Wno-inconsistent-missing-override # unfortunately there is no warning in MSVC to detect missing overrides, - # MSVC's static analyzer can, but that is a different run that most developers are not ware of. A pass + # MSVC's static analyzer can, but that is a different run that most developers are not aware of. A pass # was done to fix all hits. Leaving this disabled until there is a matching warning in MSVC. -Wrange-loop-analysis diff --git a/cmake/Platform/Common/MSVC/Directory.Build.props b/cmake/Platform/Common/MSVC/Directory.Build.props index 589e14a6cb..b8e9b716d9 100644 --- a/cmake/Platform/Common/MSVC/Directory.Build.props +++ b/cmake/Platform/Common/MSVC/Directory.Build.props @@ -14,7 +14,7 @@ SPDX-License-Identifier: Apache-2.0 OR MIT @VCPKG_CONFIGURATION_MAPPING@ false - @LY_ROOT_FOLDER@\cmake\Platform\Common\MSVC\CodeAnalysis.ruleset + $(MSBuildThisFileDirectory)CodeAnalysis.ruleset diff --git a/cmake/Platform/Common/MSVC/VisualStudio_common.cmake b/cmake/Platform/Common/MSVC/VisualStudio_common.cmake index 9124758b18..d9e58090d9 100644 --- a/cmake/Platform/Common/MSVC/VisualStudio_common.cmake +++ b/cmake/Platform/Common/MSVC/VisualStudio_common.cmake @@ -15,4 +15,4 @@ foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES) endforeach() configure_file("${CMAKE_CURRENT_LIST_DIR}/Directory.Build.props" "${CMAKE_BINARY_DIR}/Directory.Build.props" @ONLY) - +file(COPY_FILE "${CMAKE_CURRENT_LIST_DIR}/CodeAnalysis.ruleset" "${CMAKE_BINARY_DIR}/CodeAnalysis.ruleset" ONLY_IF_DIFFERENT)