From b4f6dc5bff2640fbef603f11099250310f4bd757 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Thu, 12 Aug 2021 16:44:01 -0700 Subject: [PATCH] fixes after merge Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- cmake/Platform/Common/MSVC/Configurations_msvc.cmake | 2 +- cmake/cmake_files.cmake | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cmake/Platform/Common/MSVC/Configurations_msvc.cmake b/cmake/Platform/Common/MSVC/Configurations_msvc.cmake index c0d0809b0f..891d48ddb2 100644 --- a/cmake/Platform/Common/MSVC/Configurations_msvc.cmake +++ b/cmake/Platform/Common/MSVC/Configurations_msvc.cmake @@ -95,7 +95,7 @@ ly_append_configurations_options( set(LY_BUILD_WITH_ADDRESS_SANITIZER FALSE CACHE BOOL "Builds using AddressSanitizer (ASan). Will disable Edit/Continue, Incremental building and Run-Time checks (default = FALSE)") if(LY_BUILD_WITH_ADDRESS_SANITIZER) - set(LY_BUILD_WITH_INCREMENTAL_LINKING_DEBUG FALSE) + set(LY_BUILD_WITH_INCREMENTAL_LINKING_DEBUG FALSE) ly_append_configurations_options( COMPILATION_DEBUG /fsanitize=address diff --git a/cmake/cmake_files.cmake b/cmake/cmake_files.cmake index 10676b384e..aa275b634a 100644 --- a/cmake/cmake_files.cmake +++ b/cmake/cmake_files.cmake @@ -20,7 +20,6 @@ set(FILES Findo3de.cmake Gems.cmake GeneralSettings.cmake - Initialize.cmake Install.cmake LyAutoGen.cmake LYPackage_S3Downloader.cmake