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

Issues/install missing assets (#7081)

Browse Source 
* Fixes for missing assets in the install folder

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* delayed expansion to try to fix project_engineinstall_profile

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Improvements to build scripts to solve the project build from the install folder

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2022-01-21 15:07:27 -08:00
committed by GitHub
parent 7fa6a82f55
commit a145d3c82f
4 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/Platform/Common/Install_common.cmake
+5 -3
View File
@@ -445,9 +445,10 @@ function(ly_setup_cmake_install)
)
endforeach()
# Transform the LY_EXTERNAL_SUBDIRS list into a json array
# Transform the LY_EXTERNAL_SUBDIRS global property list into a json array
set(indent " ")
foreach(external_subdir ${LY_EXTERNAL_SUBDIRS})
get_property(external_subdirs GLOBAL PROPERTY LY_EXTERNAL_SUBDIRS)
foreach(external_subdir ${external_subdirs})
cmake_path(RELATIVE_PATH external_subdir BASE_DIRECTORY ${LY_ROOT_FOLDER} OUTPUT_VARIABLE engine_rel_external_subdir)
list(APPEND relative_external_subdirs "\"${engine_rel_external_subdir}\"")
endforeach()
@@ -639,7 +640,8 @@ function(ly_setup_assets)
# the install layout from the root directory. Such as <external-subdirectory-root>/Cache.
# This is also done to avoid globbing thousands of files in subdirectories that shouldn't
# be processed.
foreach(gem_candidate_dir IN LISTS LY_EXTERNAL_SUBDIRS LY_PROJECTS)
get_property(external_subdirs GLOBAL PROPERTY LY_EXTERNAL_SUBDIRS)
foreach(gem_candidate_dir IN LISTS external_subdirs LY_PROJECTS)
file(REAL_PATH ${gem_candidate_dir} gem_candidate_dir BASE_DIRECTORY ${LY_ROOT_FOLDER})
# Don't recurse immediately in order to exclude transient source artifacts
file(GLOB