birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fixes an issue with RUNTIME_DEPENDENCIES including too many targets during install"

Browse Source 
This reverts commit f972edee01.
This commit is contained in:
lumberyard-employee-dm
2021-05-25 17:30:47 -05:00
parent d3835699ea
commit d536a9438d
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/LYWrappers.cmake
-7
View File
@@ -379,16 +379,9 @@ function(ly_delayed_target_link_libraries)
list(APPEND CMAKE_MODULE_PATH ${additional_module_paths})
get_property(delayed_targets GLOBAL PROPERTY LY_DELAYED_LINK_TARGETS)
foreach(target ${delayed_targets})
get_property(delayed_link GLOBAL PROPERTY LY_DELAYED_LINK_${target})
# Cache off the original MANUALLY_ADDED_DEPENDENCIES that were associated with the target
# via previous ly_add_dependencies() calls either explicitly or through RUNTIME_DEPENDENCIES
get_target_property(target_orig_manually_added_dependencies ${target} MANUALLY_ADDED_DEPENDENCIES)
set_property(TARGET ${target} PROPERTY LY_ORIGINAL_MANUALLY_ADDED_DEPENDENCIES ${target_orig_manually_added_dependencies})
if(delayed_link)
cmake_parse_arguments(ly_delayed_target_link_libraries "" "" "${visibilities}" ${delayed_link})
cmake/Platform/Common/Install_common.cmake
+1 -1
View File
@@ -125,7 +125,7 @@ function(ly_setup_target ALIAS_TARGET_NAME)
endforeach()
endif()
get_target_property(RUNTIME_DEPENDENCIES_PLACEHOLDER ${TARGET_NAME} LY_ORIGINAL_MANUALLY_ADDED_DEPENDENCIES)
get_target_property(RUNTIME_DEPENDENCIES_PLACEHOLDER ${TARGET_NAME} MANUALLY_ADDED_DEPENDENCIES)
if(RUNTIME_DEPENDENCIES_PLACEHOLDER) # not found properties return the name of the variable with a "-NOTFOUND" at the end, here we set it to empty if not found
string(REPLACE ";" "\n" RUNTIME_DEPENDENCIES_PLACEHOLDER "${RUNTIME_DEPENDENCIES_PLACEHOLDER}")
else()