From c67cd2dc4e25fa3f3890d4937d57327f537b68a0 Mon Sep 17 00:00:00 2001 From: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> Date: Thu, 27 May 2021 17:35:08 -0500 Subject: [PATCH 1/2] Renaming the TargetCMakeLists.txt.in to InstalledTarget.in to get avoid it being picked up by the CopyrightValidator --- cmake/Platform/Common/Install_common.cmake | 2 +- cmake/install/{TargetCMakeLists.txt.in => InstalledTarget.in} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename cmake/install/{TargetCMakeLists.txt.in => InstalledTarget.in} (100%) diff --git a/cmake/Platform/Common/Install_common.cmake b/cmake/Platform/Common/Install_common.cmake index 939f523d75..b18aed6fb4 100644 --- a/cmake/Platform/Common/Install_common.cmake +++ b/cmake/Platform/Common/Install_common.cmake @@ -182,7 +182,7 @@ set_property(TARGET ${TARGET_NAME} ) # Since a CMakeLists.txt could contain multiple targets, we generate it in a folder per target - file(READ ${LY_ROOT_FOLDER}/cmake/install/TargetCMakeLists.txt.in target_cmakelists_template) + file(READ ${LY_ROOT_FOLDER}/cmake/install/InstalledTarget.in target_cmakelists_template) string(CONFIGURE ${target_cmakelists_template} output_cmakelists_data @ONLY) set(${OUTPUT_CONFIGURED_TARGET} ${output_cmakelists_data} PARENT_SCOPE) endfunction() diff --git a/cmake/install/TargetCMakeLists.txt.in b/cmake/install/InstalledTarget.in similarity index 100% rename from cmake/install/TargetCMakeLists.txt.in rename to cmake/install/InstalledTarget.in From 166db0b0c60dd80e833c4d7e80b75f0e4f8a7532 Mon Sep 17 00:00:00 2001 From: pappeste Date: Thu, 27 May 2021 16:09:12 -0700 Subject: [PATCH 2/2] Android fix for FastNoise --- Gems/FastNoise/Code/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Gems/FastNoise/Code/CMakeLists.txt b/Gems/FastNoise/Code/CMakeLists.txt index 8c12dcf5be..ae42af771a 100644 --- a/Gems/FastNoise/Code/CMakeLists.txt +++ b/Gems/FastNoise/Code/CMakeLists.txt @@ -134,6 +134,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED) PRIVATE AZ::AzTest Gem::FastNoise.Static + Gem::LmbrCentral ) ly_add_googletest( NAME Gem::FastNoise.Tests