From 4485edf77d118771e4a051fefb91d009deb7353f Mon Sep 17 00:00:00 2001
From: Eric Phister <52085794+amzn-phist@users.noreply.github.com>
Date: Mon, 3 May 2021 17:46:54 -0500
Subject: [PATCH] LYN-2578: Updates cmake install for 'scripts' directory.
 (#518)

* LYN-2578: Updates cmake install for 'scripts' directory.  Updates destination of certain binaries.
* LYN-2578: Updates to cmake install based on feedback.
---
 CMakeLists.txt                             |  4 ++-
 cmake/Platform/Common/Install_common.cmake | 38 +++++++++++++++-------
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cefbcf2ef4..868757ebcd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,7 +75,9 @@ foreach(restricted_platform ${PAL_RESTRICTED_PLATFORMS})
     endif()
 endforeach()
 
-add_subdirectory(scripts)
+if(NOT INSTALLED_ENGINE)
+    add_subdirectory(scripts)
+endif()
 
 # SPEC-1417 will investigate and fix this
 if(NOT PAL_PLATFORM_NAME STREQUAL "Mac")
diff --git a/cmake/Platform/Common/Install_common.cmake b/cmake/Platform/Common/Install_common.cmake
index fb3a7b1b09..8fe2fe2c1c 100644
--- a/cmake/Platform/Common/Install_common.cmake
+++ b/cmake/Platform/Common/Install_common.cmake
@@ -286,7 +286,7 @@ endfunction()
 function(ly_setup_others)
 
     # List of directories we want to install relative to engine root
-    set(DIRECTORIES_TO_INSTALL Tools/LyTestTools Tools/RemoteConsole scripts)
+    set(DIRECTORIES_TO_INSTALL Tools/LyTestTools Tools/RemoteConsole)
     foreach(dir ${DIRECTORIES_TO_INSTALL})
 
         get_filename_component(install_path ${dir} DIRECTORY)
@@ -301,6 +301,24 @@ function(ly_setup_others)
 
     endforeach()
 
+    # Scripts
+    file(GLOB o3de_scripts "${CMAKE_SOURCE_DIR}/scripts/o3de.*")
+    install(FILES
+        ${o3de_scripts}
+        DESTINATION ./scripts
+        COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
+    )
+
+    install(DIRECTORY
+        ${CMAKE_SOURCE_DIR}/scripts/bundler
+        ${CMAKE_SOURCE_DIR}/scripts/project_manager
+        DESTINATION ./scripts
+        COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
+        PATTERN "__pycache__" EXCLUDE
+        PATTERN "CMakeLists.txt" EXCLUDE
+        PATTERN "tests" EXCLUDE
+    )
+
     install(DIRECTORY "${CMAKE_SOURCE_DIR}/python"
         DESTINATION .
         COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
@@ -311,7 +329,7 @@ function(ly_setup_others)
     # Registry
     install(DIRECTORY
         ${CMAKE_CURRENT_BINARY_DIR}/bin/$<CONFIG>/Registry
-        DESTINATION ./bin/$<CONFIG>
+        DESTINATION ./bin/${PAL_PLATFORM_NAME}/$<CONFIG>
         COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
     )
     install(DIRECTORY
@@ -350,16 +368,14 @@ function(ly_setup_others)
         endif()
     endforeach()
 
-
     # Qt Binaries
-    set(QT_BIN_DIRS bearer iconengines imageformats platforms styles translations)
-    foreach(qt_dir ${QT_BIN_DIRS})
-        install(DIRECTORY
-            ${CMAKE_CURRENT_BINARY_DIR}/bin/$<CONFIG>/${qt_dir}
-            DESTINATION ./bin/$<CONFIG>
-            COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
-        )
-    endforeach()
+    set(QT_DIRS bearer iconengines imageformats platforms styles translations)
+    list(TRANSFORM QT_DIRS PREPEND "${CMAKE_CURRENT_BINARY_DIR}/bin/$<CONFIG>/" OUTPUT_VARIABLE QT_BIN_DIRS)
+    install(DIRECTORY
+        ${QT_BIN_DIRS}
+        DESTINATION ./bin/${PAL_PLATFORM_NAME}/$<CONFIG>
+        COMPONENT ${LY_DEFAULT_INSTALL_COMPONENT}
+    )
 
     # Templates
     install(DIRECTORY