From bf0a309a3c302a44c3e37aa52ae595fa90977267 Mon Sep 17 00:00:00 2001
From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
Date: Mon, 1 Nov 2021 15:18:30 -0700
Subject: [PATCH] copy commands need to be per permutation/per configuraiton
 (#5183)

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
---
 cmake/Platform/Common/Install_common.cmake | 18 ++++++++++--------
 cmake/Platform/Linux/Install_linux.cmake   |  9 ++++++---
 cmake/Platform/Mac/Install_mac.cmake       |  7 ++++++-
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/cmake/Platform/Common/Install_common.cmake b/cmake/Platform/Common/Install_common.cmake
index 803edb7b1d..2960a99c64 100644
--- a/cmake/Platform/Common/Install_common.cmake
+++ b/cmake/Platform/Common/Install_common.cmake
@@ -525,15 +525,20 @@ function(ly_setup_runtime_dependencies)
     if(COMMAND ly_setup_runtime_dependencies_copy_function_override)
         ly_setup_runtime_dependencies_copy_function_override()
     else()
-        ly_install(CODE
+        # despite this copy function being the same, we need to install it per component that uses it
+        # (which is per-configuration per-permutation component)
+        foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES)
+            string(TOUPPER ${conf} UCONF)
+            ly_install(CODE
 "function(ly_copy source_file target_directory)
     cmake_path(GET source_file FILENAME file_name)
     if(NOT EXISTS \${target_directory}/\${file_name})
         file(COPY \"\${source_file}\" DESTINATION \"\${target_directory}\" FILE_PERMISSIONS ${LY_COPY_PERMISSIONS})
     endif()
 endfunction()"
-            COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}
-        )
+                COMPONENT ${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF}
+            )
+        endforeach()
     endif()
 
     unset(runtime_commands)
@@ -574,11 +579,8 @@ endfunction()"
     list(JOIN runtime_commands "    " runtime_commands_str) # the spaces are just to see the right identation in the cmake_install.cmake file
     foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES)
         string(TOUPPER ${conf} UCONF)
-        ly_install(CODE
-"if(\"\${CMAKE_INSTALL_CONFIG_NAME}\" MATCHES \"^(${conf})\$\")
-    ${runtime_commands_str}
-endif()" 
-            COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}_${UCONF}
+        ly_install(CODE "${runtime_commands_str}"
+            COMPONENT ${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF}
         )
     endforeach()
 
diff --git a/cmake/Platform/Linux/Install_linux.cmake b/cmake/Platform/Linux/Install_linux.cmake
index 54d1e18837..02baa6e61e 100644
--- a/cmake/Platform/Linux/Install_linux.cmake
+++ b/cmake/Platform/Linux/Install_linux.cmake
@@ -22,9 +22,12 @@ endfunction()]])
 
 function(ly_setup_runtime_dependencies_copy_function_override)
     string(CONFIGURE "${ly_copy_template}" ly_copy_function_linux @ONLY)
-    ly_install(CODE "${ly_copy_function_linux}" 
-        COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}
-    )
+    foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES)
+        string(TOUPPER ${conf} UCONF)
+        ly_install(CODE "${ly_copy_function_linux}" 
+            COMPONENT  ${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF}
+        )
+    endforeach()
 endfunction()
 
 include(cmake/Platform/Common/Install_common.cmake)
diff --git a/cmake/Platform/Mac/Install_mac.cmake b/cmake/Platform/Mac/Install_mac.cmake
index 76c381138d..c75d860c3e 100644
--- a/cmake/Platform/Mac/Install_mac.cmake
+++ b/cmake/Platform/Mac/Install_mac.cmake
@@ -113,7 +113,12 @@ endfunction()
 function(ly_setup_runtime_dependencies_copy_function_override)
 
     configure_file(${LY_ROOT_FOLDER}/cmake/Platform/Mac/InstallUtils_mac.cmake.in ${CMAKE_BINARY_DIR}/runtime_install/InstallUtils_mac.cmake @ONLY)
-    ly_install_run_script(${CMAKE_BINARY_DIR}/runtime_install/InstallUtils_mac.cmake)
+    foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES)
+        string(TOUPPER ${conf} UCONF)
+        ly_install(SCRIPT "${CMAKE_BINARY_DIR}/runtime_install/InstallUtils_mac.cmake"
+            COMPONENT  ${LY_INSTALL_PERMUTATION_COMPONENT}_${UCONF}
+        )
+    endforeach()
 
 endfunction()