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

2021-05-25 17:41:22 -05:00
parent f12162a1cf d536a9438d
commit fe29728233
32 changed files with 148 additions and 88 deletions
@@ -129,6 +129,8 @@ ly_add_target(
            3rdParty::AWSNativeSDK::Core
            3rdParty::Qt::Network
            Legacy::EditorCore
+    RUNTIME_DEPENDENCIES
+        Gem::AtomViewportDisplayInfo
 )
 ly_add_source_properties(
    SOURCES CryEdit.cpp
@@ -243,7 +245,8 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
                Legacy::CryCommon
                AZ::AzToolsFramework
                Legacy::EditorLib
-                Gem::LmbrCentral
+        RUNTIME_DEPENDENCIES
+            Gem::LmbrCentral
    )
    ly_add_googletest(
        NAME Legacy::EditorLib.Tests
@@ -35,7 +35,9 @@ ly_add_target(
            AZ::AzToolsFramework
            Legacy::CryCommon
            Legacy::EditorLib
-            Gem::LmbrCentral
+            Gem::LmbrCentral.Editor
+    RUNTIME_DEPENDENCIES
+        Gem::LmbrCentral.Editor
 )

 ly_add_dependencies(Editor ComponentEntityEditorPlugin)
@@ -65,7 +67,8 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
                AZ::AzToolsFrameworkTestCommon
                Legacy::CryCommon
                Legacy::EditorLib
-                Gem::LmbrCentral
+        RUNTIME_DEPENDENCIES
+            Gem::LmbrCentral.Editor
    )
    ly_add_googletest(
        NAME Legacy::ComponentEntityEditorPlugin.Tests