From bff7d39f68d2e7fed3afa11dd22e95ed0d1c8c54 Mon Sep 17 00:00:00 2001
From: pappeste <pappeste@amazon.com>
Date: Mon, 24 May 2021 16:21:29 -0700
Subject: [PATCH] passing imported for executables

---
 cmake/LYWrappers.cmake       | 23 +++++++++++++++--------
 cmake/SettingsRegistry.cmake |  7 ++++++-
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/cmake/LYWrappers.cmake b/cmake/LYWrappers.cmake
index bddd1a6c66..0e4ba5e214 100644
--- a/cmake/LYWrappers.cmake
+++ b/cmake/LYWrappers.cmake
@@ -100,22 +100,27 @@ function(ly_add_target)
         ly_include_cmake_file_list(${file_cmake})
     endforeach()
 
-    set(linking_options)
-    set(linking_count)
+    unset(linking_options)
+    unset(linking_count)
+    unset(target_type_options)
     if(ly_add_target_STATIC)
         set(linking_options STATIC)
+        set(target_type_options STATIC)
         set(linking_count "${linking_count}1")
     endif()
     if(ly_add_target_SHARED)
         set(linking_options SHARED)
+        set(target_type_options SHARED)
         set(linking_count "${linking_count}1")
     endif()
     if(ly_add_target_MODULE)
         set(linking_options ${PAL_LINKOPTION_MODULE})
+        set(target_type_options ${PAL_LINKOPTION_MODULE})
         set(linking_count "${linking_count}1")
     endif()
     if(ly_add_target_HEADERONLY)
         set(linking_options INTERFACE)
+        set(target_type_options INTERFACE)
         set(linking_count "${linking_count}1")
         endif()
     if(ly_add_target_EXECUTABLE)
@@ -130,7 +135,7 @@ function(ly_add_target)
         message(FATAL_ERROR "More than one of the following options [STATIC | SHARED | MODULE | HEADERONLY | EXECUTABLE | APPLICATION ] was specified and they are mutually exclusive")
     endif()
     if(ly_add_target_IMPORTED)
-        list(APPEND linking_options IMPORTED GLOBAL)
+        list(APPEND target_type_options IMPORTED GLOBAL)
     endif()
 
     if(ly_add_target_NAMESPACE)
@@ -141,7 +146,8 @@ function(ly_add_target)
 
     set(project_NAME ${ly_add_target_NAME})
     if(ly_add_target_EXECUTABLE)
-        add_executable(${ly_add_target_NAME}
+        add_executable(${ly_add_target_NAME} 
+            ${target_type_options}
             ${ALLFILES} ${ly_add_target_GENERATED_FILES}
         )
         ly_apply_platform_properties(${ly_add_target_NAME})
@@ -149,7 +155,8 @@ function(ly_add_target)
             set_target_properties(${ly_add_target_NAME} PROPERTIES LINKER_LANGUAGE CXX)
         endif()
     elseif(ly_add_target_APPLICATION)
-        add_executable(${ly_add_target_NAME}
+        add_executable(${ly_add_target_NAME} 
+            ${target_type_options}
             ${PAL_EXECUTABLE_APPLICATION_FLAG}
             ${ALLFILES} ${ly_add_target_GENERATED_FILES}
         )
@@ -159,12 +166,12 @@ function(ly_add_target)
         endif()
     elseif(ly_add_target_HEADERONLY)
         add_library(${ly_add_target_NAME}
-            ${linking_options}
+            ${target_type_options}
             ${ALLFILES} ${ly_add_target_GENERATED_FILES}
         )
     else()
         add_library(${ly_add_target_NAME}
-            ${linking_options}
+            ${target_type_options}
             ${ALLFILES} ${ly_add_target_GENERATED_FILES}
         )
         ly_apply_platform_properties(${ly_add_target_NAME})
@@ -302,7 +309,7 @@ function(ly_add_target)
     set_property(GLOBAL APPEND PROPERTY LY_ALL_TARGETS ${interface_name})
 
     set(runtime_dependencies_list SHARED MODULE EXECUTABLE APPLICATION)
-    if(linking_options IN_LIST runtime_dependencies_list)
+    if(NOT ly_add_target_IMPORTED AND linking_options IN_LIST runtime_dependencies_list)
 
         add_custom_command(TARGET ${ly_add_target_NAME} POST_BUILD
             COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/runtime_dependencies/$<CONFIG>/${ly_add_target_NAME}.cmake
diff --git a/cmake/SettingsRegistry.cmake b/cmake/SettingsRegistry.cmake
index 31ce36c516..b40650d900 100644
--- a/cmake/SettingsRegistry.cmake
+++ b/cmake/SettingsRegistry.cmake
@@ -150,7 +150,12 @@ function(ly_delayed_generate_settings_registry)
 
         list(JOIN target_gem_dependencies_names ",\n" target_gem_dependencies_names)
         string(CONFIGURE ${gems_json_template} gem_json @ONLY)
-        set(dependencies_setreg $<TARGET_FILE_DIR:${target}>/Registry/cmake_dependencies.${specialization_name}.setreg)
+        if(prefix)
+            set(target_dir $<TARGET_FILE_DIR:${prefix}>)
+        else()
+            set(target_dir $<TARGET_FILE_DIR:${target}>)
+        endif()
+        set(dependencies_setreg ${target_dir}/Registry/cmake_dependencies.${specialization_name}.setreg)
         file(GENERATE OUTPUT ${dependencies_setreg} CONTENT ${gem_json})
         set_property(TARGET ${target} APPEND PROPERTY INTERFACE_LY_TARGET_FILES "${dependencies_setreg}\nRegistry")