Fix some cross dependencies between client and non-client gems

Gems/LyShineExamples/Code/CMakeLists.txt

@@ -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,12 @@ ly_add_target(
     BUILD_DEPENDENCIES
         PRIVATE
             Gem::LyShineExamples.Static
-    RUNTIME_DEPENDENCIES
-        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

@@ -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,14 @@ ly_add_target(
         PRIVATE
             Legacy::CryCommon
             Gem::ScriptCanvasPhysics.Static
-    RUNTIME_DEPENDENCIES
-        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

Gems/ScriptCanvasTesting/Code/CMakeLists.txt

@@ -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

cmake/SettingsRegistry.cmake

@@ -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