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

Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948

Browse Source
This commit is contained in:
lumberyard-employee-dm
2021-05-27 20:56:14 -05:00
parent 87721cae55 68e2fb83dd
commit fc61ca2d0c
9 changed files with 47 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AutomatedTesting/EngineFinder.cmake
+4 -1
View File
@@ -61,5 +61,8 @@ if(EXISTS ${manifest_path})
endif()
endforeach()
else()
message(FATAL_ERROR "Engine registration is required before configuring a project. Please register an engine by running 'scripts/o3de register --this-engine'")
# If the user is passing CMAKE_MODULE_PATH we assume thats where we will find the engine
if(NOT CMAKE_MODULE_PATH)
message(FATAL_ERROR "Engine registration is required before configuring a project. Please register an engine by running 'scripts/o3de register --this-engine'")
endif()
endif()
AutomatedTesting/Gem/Code/CMakeLists.txt
+6
View File
@@ -28,6 +28,12 @@ ly_add_target(
Gem::Atom_AtomBridge.Static
)
# if enabled, AutomatedTesting is used by all kinds of applications
ly_create_alias(NAME AutomatedTesting.Builders NAMESPACE Gem TARGETS Gem::AutomatedTesting)
ly_create_alias(NAME AutomatedTesting.Tools NAMESPACE Gem TARGETS Gem::AutomatedTesting)
ly_create_alias(NAME AutomatedTesting.Clients NAMESPACE Gem TARGETS Gem::AutomatedTesting)
ly_create_alias(NAME AutomatedTesting.Servers NAMESPACE Gem TARGETS Gem::AutomatedTesting)
################################################################################
# Gem dependencies
################################################################################
Gems/LyShineExamples/Code/CMakeLists.txt
+9 -8
View File
@@ -20,9 +20,10 @@ ly_add_target(
PUBLIC
Include
BUILD_DEPENDENCIES
PRIVATE
Gem::LmbrCentral
PUBLIC
Legacy::CryCommon
Gem::LmbrCentral
Gem::LyShine.Static
)
@@ -39,13 +40,13 @@ ly_add_target(
BUILD_DEPENDENCIES
PRIVATE
Gem::LyShineExamples.Static
RUNTIME_DEPENDENCIES
Gem::LmbrCentral
Gem::LmbrCentral
)
# if enabled, LyShineExamples is used by all kinds of applications
ly_create_alias(NAME LyShineExamples.Builders NAMESPACE Gem TARGETS Gem::LyShineExamples)
ly_create_alias(NAME LyShineExamples.Tools NAMESPACE Gem TARGETS Gem::LyShineExamples)
ly_create_alias(NAME LyShineExamples.Clients NAMESPACE Gem TARGETS Gem::LyShineExamples)
ly_create_alias(NAME LyShineExamples.Servers NAMESPACE Gem TARGETS Gem::LyShineExamples)
# if enabled, LyShineExamples is used by all kinds of applications, however, the dependency to LmbrCentral is different
# per application type
ly_create_alias(NAME LyShineExamples.Builders NAMESPACE Gem TARGETS Gem::LyShineExamples Gem::LmbrCentral.Editor)
ly_create_alias(NAME LyShineExamples.Tools NAMESPACE Gem TARGETS Gem::LyShineExamples Gem::LmbrCentral.Editor)
ly_create_alias(NAME LyShineExamples.Clients NAMESPACE Gem TARGETS Gem::LyShineExamples Gem::LmbrCentral)
ly_create_alias(NAME LyShineExamples.Servers NAMESPACE Gem TARGETS Gem::LyShineExamples Gem::LmbrCentral)
Gems/ScriptCanvasPhysics/Code/CMakeLists.txt
+9 -9
View File
@@ -18,10 +18,9 @@ ly_add_target(
PRIVATE
Source
BUILD_DEPENDENCIES
PUBLIC
Gem::ScriptCanvas
PRIVATE
Legacy::CryCommon
Gem::ScriptCanvas
)
ly_add_target(
@@ -36,15 +35,15 @@ ly_add_target(
PRIVATE
Legacy::CryCommon
Gem::ScriptCanvasPhysics.Static
RUNTIME_DEPENDENCIES
Gem::ScriptCanvas
Gem::ScriptCanvas
)
# By default, the above module is used by all application types
ly_create_alias(NAME ScriptCanvasPhysics.Clients NAMESPACE Gem TARGETS Gem::ScriptCanvasPhysics)
ly_create_alias(NAME ScriptCanvasPhysics.Servers NAMESPACE Gem TARGETS Gem::ScriptCanvasPhysics)
ly_create_alias(NAME ScriptCanvasPhysics.Tools NAMESPACE Gem TARGETS Gem::ScriptCanvasPhysics)
ly_create_alias(NAME ScriptCanvasPhysics.Builders NAMESPACE Gem TARGETS Gem::ScriptCanvasPhysics)
# By default, the above module is used by all application types, however, the module depends at runtime to ScriptCanvas
# and the dependency needs to be different per application type
ly_create_alias(NAME ScriptCanvasPhysics.Clients NAMESPACE Gem TARGETS Gem::ScriptCanvasPhysics Gem::ScriptCanvas)
ly_create_alias(NAME ScriptCanvasPhysics.Servers NAMESPACE Gem TARGETS Gem::ScriptCanvasPhysics Gem::ScriptCanvas)
ly_create_alias(NAME ScriptCanvasPhysics.Tools NAMESPACE Gem TARGETS Gem::ScriptCanvasPhysics Gem::ScriptCanvas.Editor)
ly_create_alias(NAME ScriptCanvasPhysics.Builders NAMESPACE Gem TARGETS Gem::ScriptCanvasPhysics Gem::ScriptCanvas.Editor)
################################################################################
# Tests
@@ -65,6 +64,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
AZ::AzTest
Legacy::CryCommon
Gem::ScriptCanvasPhysics.Static
Gem::ScriptCanvas
)
ly_add_googletest(
NAME Gem::ScriptCanvasPhysics.Tests
Gems/ScriptCanvasTesting/Code/CMakeLists.txt
+2 -2
View File
@@ -34,7 +34,7 @@ ly_add_target(
Gem::ScriptCanvas
Gem::ScriptCanvasEditor
Gem::GraphCanvasWidgets
Gem::ScriptEvents
Gem::ScriptEvents.Editor
PRIVATE
AZ::AzCore
AZ::AzFramework
@@ -46,7 +46,7 @@ ly_add_target(
*.ScriptCanvasNodeable.xml,ScriptCanvasNodeable_Header.jinja,$path/$fileprefix.generated.h
*.ScriptCanvasNodeable.xml,ScriptCanvasNodeable_Source.jinja,$path/$fileprefix.generated.cpp
RUNTIME_DEPENDENCIES
Gem::ScriptCanvas
Gem::ScriptCanvas.Editor
Gem::ScriptCanvasEditor
Gem::GraphCanvasWidgets
Gem::ScriptEvents
Templates/DefaultProject/Template/Code/CMakeLists.txt
+9 -3
View File
@@ -33,7 +33,7 @@ endif()
# in ${pal_dir}/${NameLower}_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
ly_add_target(
NAME ${Name}.Static STATIC
NAMESPACE Project
NAMESPACE Gem
FILES_CMAKE
${NameLower}_files.cmake
${pal_dir}/${NameLower}_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
@@ -48,7 +48,7 @@ ly_add_target(
ly_add_target(
NAME ${Name} ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
NAMESPACE Project
NAMESPACE Gem
FILES_CMAKE
${NameLower}_shared_files.cmake
${pal_dir}/${NameLower}_shared_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
@@ -57,10 +57,16 @@ ly_add_target(
Include
BUILD_DEPENDENCIES
PRIVATE
Project::${Name}.Static
Gem::${Name}.Static
AZ::AzCore
)
# if enabled, ${Name} is used by all kinds of applications
ly_create_alias(NAME ${Name}.Builders NAMESPACE Gem TARGETS Gem::${Name})
ly_create_alias(NAME ${Name}.Tools NAMESPACE Gem TARGETS Gem::${Name})
ly_create_alias(NAME ${Name}.Clients NAMESPACE Gem TARGETS Gem::${Name})
ly_create_alias(NAME ${Name}.Servers NAMESPACE Gem TARGETS Gem::${Name})
################################################################################
# Gem dependencies
################################################################################
Templates/DefaultProject/Template/EngineFinder.cmake
+4 -1
View File
@@ -61,5 +61,8 @@ if(EXISTS ${manifest_path})
endif()
endforeach()
else()
message(FATAL_ERROR "Engine registration is required before configuring a project. Please register an engine by running 'scripts/o3de register --this-engine'")
# If the user is passing CMAKE_MODULE_PATH we assume thats where we will find the engine
if(NOT CMAKE_MODULE_PATH)
message(FATAL_ERROR "Engine registration is required before configuring a project. Please register an engine by running 'scripts/o3de register --this-engine'")
endif()
endif()
cmake/LYWrappers.cmake
+3 -3
View File
@@ -88,8 +88,8 @@ function(ly_add_target)
endif()
if(NOT ly_add_target_IMPORTED AND NOT ly_add_target_HEADERONLY)
if(NOT ly_add_target_FILES_CMAKE)
message(FATAL_ERROR "You must provide a list of _files.cmake files for the target")
endif()
message(FATAL_ERROR "You must provide a list of _files.cmake files for the target")
endif()
endif()
# If the GEM_MODULE tag is passed set the normal MODULE argument
@@ -127,7 +127,7 @@ function(ly_add_target)
set(linking_options INTERFACE)
set(target_type_options INTERFACE)
set(linking_count "${linking_count}1")
endif()
endif()
if(ly_add_target_EXECUTABLE)
set(linking_options EXECUTABLE)
set(linking_count "${linking_count}1")
cmake/SettingsRegistry.cmake
+1 -1
View File
@@ -74,7 +74,6 @@ function(ly_get_gem_load_dependencies ly_GEM_LOAD_DEPENDENCIES ly_TARGET)
ly_get_gem_load_dependencies(dependencies ${dealias_load_dependency})
list(APPEND all_gem_load_dependencies ${dependencies})
list(APPEND all_gem_load_dependencies ${dealias_load_dependency})
message(VERBOSE "Load Dependency \"${dealias_load_dependency}\" has load dependencies of: ${dependencies}")
endif()
endforeach()
endif()
@@ -83,6 +82,7 @@ function(ly_get_gem_load_dependencies ly_GEM_LOAD_DEPENDENCIES ly_TARGET)
set_property(GLOBAL PROPERTY LY_GEM_LOAD_DEPENDENCIES_${ly_TARGET} "${all_gem_load_dependencies}")
set(${ly_GEM_LOAD_DEPENDENCIES} ${all_gem_load_dependencies} PARENT_SCOPE)
message(VERBOSE "Gem Target \"${ly_TARGET}\" has load dependencies of: ${all_gem_load_dependencies}")
endfunction()
#!ly_get_gem_module_root: Uses the supplied gem_target to lookup the nearest gem.json file above the SOURCE_DIR