fixes monolithic release

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-09-02 18:24:25 -07:00
parent dc4424b131
commit 9a6a1ba97a
7 changed files with 36 additions and 16 deletions
@@ -6,6 +6,10 @@
#
#
if(LY_MONOLITHIC_GAME)
return()
endif()
ly_add_target(
NAME TestImpact.Frontend.Console.Static STATIC
NAMESPACE AZ
+2 -2
View File
@@ -39,7 +39,7 @@ ly_add_target(
Gem::Atom_Utils.Static
Gem::Atom_Feature_Common.Public
Gem::ImGui.imguilib
3rdParty::lux_core
#3rdParty::lux_core # AZ_TRAIT_LUXCORE_SUPPORTED is disabled in every platform, Issue #3915 will remove
)
ly_add_target(
@@ -87,7 +87,7 @@ ly_add_target(
AZ::AzFramework
Gem::Atom_Feature_Common.Static
Gem::Atom_Feature_Common.Public
3rdParty::lux_core
#3rdParty::lux_core # AZ_TRAIT_LUXCORE_SUPPORTED is disabled in every platform, Issue #3915 will remove
)
if(PAL_TRAIT_BUILD_HOST_TOOLS)
@@ -6,6 +6,10 @@
#
#
if(LY_MONOLITHIC_GAME) # Do not use OpenImageIO in monolithic game
return()
endif()
set(LY_BUILD_DEPENDENCIES
PRIVATE
3rdParty::OpenImageIO
+16 -13
View File
@@ -35,17 +35,20 @@ ly_add_target(
ly_create_alias(NAME CrashReporting.Clients NAMESPACE Gem TARGETS Gem::CrashReporting)
ly_create_alias(NAME CrashReporting.Servers NAMESPACE Gem TARGETS Gem::CrashReporting)
if(NOT LY_MONOLITHIC_GAME)
ly_add_target(
NAME CrashReporting.Uploader APPLICATION
NAMESPACE AZ
FILES_CMAKE
game_crash_uploader_files.cmake
Platform/${PAL_PLATFORM_NAME}/game_crash_uploader_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
INCLUDE_DIRECTORIES
PRIVATE
Include
BUILD_DEPENDENCIES
PRIVATE
AZ::CrashUploaderSupport
)
ly_add_target(
NAME CrashReporting.Uploader APPLICATION
NAMESPACE AZ
FILES_CMAKE
game_crash_uploader_files.cmake
Platform/${PAL_PLATFORM_NAME}/game_crash_uploader_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
INCLUDE_DIRECTORIES
PRIVATE
Include
BUILD_DEPENDENCIES
PRIVATE
AZ::CrashUploaderSupport
)
endif()
+4
View File
@@ -6,6 +6,10 @@
#
#
if(LY_MONOLITHIC_GAME)
return()
endif()
ly_install_directory(DIRECTORIES .)
cmake_path(RELATIVE_PATH CMAKE_RUNTIME_OUTPUT_DIRECTORY BASE_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_VARIABLE runtime_output_directory)
+1 -1
View File
@@ -15,5 +15,5 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin CACHE PATH "Build dir
# be installed together. We also have an exclusion rule in the AP that filters out the
# "install" folder to avoid the AP picking it up
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
ly_set(CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR}/install)
set(CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR}/install CACHE PATH "Install directory" FORCE)
endif()
+5
View File
@@ -118,6 +118,11 @@ endfunction()
# The generated file contains the file to the each dependent targets
# This can be used for example to determine which list of gems to load with an application
function(ly_delayed_generate_settings_registry)
if(LY_MONOLITHIC_GAME) # No need to generate setregs for monolithic builds
return()
endif()
get_property(ly_delayed_load_targets GLOBAL PROPERTY LY_DELAYED_LOAD_DEPENDENCIES)
foreach(prefix_target ${ly_delayed_load_targets})
string(REPLACE "," ";" prefix_target_list "${prefix_target}")