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

Removing adding runtime dependencies for gems that are in the BUILD_DEPENDENCIES

Browse Source
This commit is contained in:
pappeste
2021-05-25 15:12:17 -07:00
parent db0db5c1c0
commit 19adbf2f41
21 changed files with 76 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Editor/CMakeLists.txt
+4 -1
View File
@@ -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
Code/Sandbox/Plugins/ComponentEntityEditorPlugin/CMakeLists.txt
+4 -1
View File
@@ -36,6 +36,8 @@ ly_add_target(
Legacy::CryCommon
Legacy::EditorLib
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.Editor
RUNTIME_DEPENDENCIES
Gem::LmbrCentral.Editor
)
ly_add_googletest(
NAME Legacy::ComponentEntityEditorPlugin.Tests
Gems/AWSClientAuth/Code/CMakeLists.txt
+10 -4
View File
@@ -29,6 +29,9 @@ ly_add_target(
Gem::HttpRequestor
3rdParty::AWSNativeSDK::AWSClientAuth
3rdParty::AWSNativeSDK::Core
RUNTIME_DEPENDENCIES
Gem::AWSCore
Gem::HttpRequestor
)
ly_add_target(
@@ -44,11 +47,13 @@ ly_add_target(
AZ::AzCore
AZ::AzFramework
Gem::AWSCore
Gem::HttpRequestor
3rdParty::AWSNativeSDK::AWSClientAuth
3rdParty::AWSNativeSDK::Core
PUBLIC
Gem::AWSClientAuth.Static
RUNTIME_DEPENDENCIES
Gem::AWSCore
Gem::HttpRequestor
)
################################################################################
@@ -71,10 +76,11 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
3rdParty::AWSNativeSDK::AWSClientAuth
AZ::AzCore
AZ::AzFramework
Gem::AWSCore
Gem::AWSClientAuth.Static
AZ::AWSNativeSDKInit
Gem::HttpRequestor
RUNTIUME_DEPENDENCIES
Gem::AWSCore
AZ::AWSNativeSDKInit
Gem::HttpRequestor
)
ly_add_googletest(
NAME Gem::AWSClientAuth.Tests
Gems/AWSMetrics/Code/CMakeLists.txt
+5 -2
View File
@@ -23,6 +23,7 @@ ly_add_target(
PRIVATE
AZ::AzCore
AZ::AzFramework
PUBLIC
Gem::AWSCore
)
@@ -40,8 +41,9 @@ ly_add_target(
PRIVATE
AZ::AzCore
AZ::AzFramework
Gem::AWSCore
Gem::AWSMetrics.Static
RUNTIME_DEPENDENCIES
Gem::AWSCore
)
################################################################################
@@ -63,8 +65,9 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
AZ::AzTest
AZ::AzCore
AZ::AzFramework
Gem::AWSCore
Gem::AWSMetrics.Static
RUNTIME_DEPENDENCIES
Gem::AWSCore
)
ly_add_googletest(
NAME Gem::AWSMetrics.Tests
Gems/AudioEngineWwise/Code/CMakeLists.txt
+2 -1
View File
@@ -205,7 +205,8 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
PUBLIC
AZ::AssetBuilderSDK
Gem::AudioEngineWwise.Static
Gem::AudioSystem.Editor
RUNTIME_DEPENDENCIES
Gem::AudioSystem.Editor
)
ly_add_target(
Gems/AudioSystem/Code/CMakeLists.txt
+2 -1
View File
@@ -101,7 +101,8 @@ if (PAL_TRAIT_BUILD_TESTS_SUPPORTED)
AZ::AzFramework
Legacy::CryCommon
Gem::AudioSystem.Static
Gem::LmbrCentral
RUNTIME_DEPENDENCIES
Gem::LmbrCentral
)
ly_add_googletest(
NAME Gem::AudioSystem.Tests
Gems/GameStateSamples/Code/CMakeLists.txt
+4
View File
@@ -44,4 +44,8 @@ ly_add_target(
AZ::AzFramework
Gem::LmbrCentral
Gem::GameStateSamples.Headers
RUNTIME_DEPENDENCIES
Gem::GameState
Gem::LocalUser
Gem::LmbrCentral
)
Gems/GradientSignal/Code/CMakeLists.txt
+3 -4
View File
@@ -44,7 +44,6 @@ ly_add_target(
Gem::ImageProcessingAtom.Headers # Atom/ImageProcessing/PixelFormats.h is part of a header in Includes
RUNTIME_DEPENDENCIES
Gem::LmbrCentral
Gem::SurfaceData
)
if(PAL_TRAIT_BUILD_HOST_TOOLS)
@@ -67,10 +66,11 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
3rdParty::Qt::Widgets
Legacy::CryCommon
AZ::AzToolsFramework
Gem::LmbrCentral.Editor
Gem::SurfaceData
AZ::AssetBuilderSDK
Gem::GradientSignal.Static
Gem::SurfaceData
RUNTIME_DEPENDENCIES
Gem::LmbrCentral.Editor
)
ly_add_target(
@@ -89,7 +89,6 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
Gem::GradientSignal.Editor.Static
RUNTIME_DEPENDENCIES
Gem::LmbrCentral.Editor
Gem::SurfaceData.Editor
)
endif()
Gems/GraphCanvas/Code/CMakeLists.txt
-1
View File
@@ -51,7 +51,6 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
ly_add_target(
NAME GraphCanvas.Editor GEM_MODULE
NAMESPACE Gem
AUTOMOC
AUTORCC
Gems/ImGui/Code/CMakeLists.txt
+2
View File
@@ -53,6 +53,8 @@ ly_add_target(
PUBLIC
Gem::ImGui.imguilib
Legacy::CryCommon
RUNTIME_DEPENDENCIES
Gem::ImGui.imguilib
)
ly_add_target(
Gems/LandscapeCanvas/Code/CMakeLists.txt
+10 -5
View File
@@ -35,16 +35,21 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
Legacy::CryCommon
Legacy::Editor.Headers
Legacy::EditorCommon
Gem::LmbrCentral.Editor
Gem::GraphCanvasWidgets
Gem::GraphModel.Editor.Static
Gem::GradientSignal.Editor
Gem::SurfaceData.Editor
Gem::Vegetation.Editor
Gem::LmbrCentral.Editor
PUBLIC
Gem::GraphCanvasWidgets
RUNTIME_DEPENDENCIES
Gem::GradientSignal.Editor
Gem::SurfaceData.Editor
Gem::Vegetation.Editor
Gem::LmbrCentral.Editor
)
ly_add_target(
NAME LandscapeCanvas.Editor GEM_MODULE
NAMESPACE Gem
FILES_CMAKE
landscapecanvas_editor_files.cmake
@@ -61,7 +66,6 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
AZ::AzCore
AZ::AzToolsFramework
Legacy::Editor.Headers
Gem::GraphCanvasWidgets
Gem::GraphModel.Editor.Static
Gem::LandscapeCanvas.Editor.Static
RUNTIME_DEPENDENCIES
@@ -97,9 +101,10 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
AZ::AzTest
AZ::AzFramework
AZ::AzToolsFramework
Gem::GraphCanvasWidgets
Gem::GraphModel.Editor.Static
Gem::LandscapeCanvas.Editor.Static
RUNTIME_DEPENDENCIES
Gem::GraphCanvasWidgets
)
ly_add_googletest(
NAME Gem::LandscapeCanvas.Editor.Tests
Gems/LyShine/Code/CMakeLists.txt
+8 -4
View File
@@ -92,6 +92,8 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
Gem::Atom_RPI.Public
Gem::Atom_Utils.Static
Gem::Atom_Bootstrap.Headers
RUNTIME_DEPENDENCIES
Gem::TextureAtlas
)
ly_add_target(
@@ -143,8 +145,9 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
AZ::AzTest
Gem::LyShine.Static
Legacy::CryCommon
Gem::LmbrCentral
Gem::TextureAtlas
RUNTIME_DEPENDENCIES
Gem::LmbrCentral
Gem::TextureAtlas
)
ly_add_googletest(
NAME Gem::LyShine.Tests
@@ -173,9 +176,10 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
AZ::AzTest
Legacy::CryCommon
AZ::AssetBuilderSDK
Gem::LmbrCentral.Editor
Gem::TextureAtlas
Gem::LyShine.Editor.Static
RUNTIME_DEPENDENCIES
Gem::LmbrCentral.Editor
Gem::TextureAtlas
)
ly_add_googletest(
NAME Gem::LyShine.Editor.Tests
Gems/PhysXDebug/Code/CMakeLists.txt
+2 -2
View File
@@ -66,9 +66,9 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
Legacy::CryCommon
Legacy::Editor.Headers
AZ::AzToolsFramework
Gem::PhysX
Gem::PhysX.Editor
Gem::ImGui.imguilib
Gem::ImGui
Gem::ImGui.Editor
RUNTIME_DEPENDENCIES
Gem::PhysX.Editor
Gem::ImGui.Editor
Gems/SceneProcessing/Code/CMakeLists.txt
+2 -1
View File
@@ -84,7 +84,8 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
BUILD_DEPENDENCIES
PRIVATE
AZ::AzTest
Gem::SceneProcessing
RUNTIME_DEPENDENCIES
Gem::SceneProcessing
)
ly_add_googletest(
NAME Gem::SceneProcessing.Tests
Gems/ScriptCanvas/Code/CMakeLists.txt
+6 -1
View File
@@ -81,6 +81,8 @@ ly_add_target(
*.ScriptCanvasGrammar.xml,ScriptCanvasGrammar_Source.jinja,$path/$fileprefix.generated.cpp
*.ScriptCanvasNodeable.xml,ScriptCanvasNodeable_Header.jinja,$path/$fileprefix.generated.h
*.ScriptCanvasNodeable.xml,ScriptCanvasNodeable_Source.jinja,$path/$fileprefix.generated.cpp
RUNTIME_DEPENDENCIES
Gem::ScriptCanvasDebugger
)
ly_add_target(
@@ -170,6 +172,8 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
Gem::ExpressionEvaluation.Static
PRIVATE
Legacy::EditorCore
RUNTIME_DEPENDENCIES
Gem::ScriptCanvas
)
ly_add_target(
@@ -228,7 +232,8 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
PRIVATE
AZ::AzTest
AZ::AzFramework
Gem::ScriptCanvas
RUNTIME_DEPENDENCIES
Gem::ScriptCanvas
)
ly_add_googletest(
NAME Gem::ScriptCanvas.Tests
Gems/ScriptCanvasDeveloper/Code/CMakeLists.txt
+1
View File
@@ -81,5 +81,6 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
Gem::GraphCanvasWidgets
RUNTIME_DEPENDENCIES
Gem::ScriptCanvas.Editor
Gem::GraphCanvasWidgets
)
endif()
Gems/ScriptCanvasPhysics/Code/CMakeLists.txt
+2
View File
@@ -36,6 +36,8 @@ ly_add_target(
PRIVATE
Legacy::CryCommon
Gem::ScriptCanvasPhysics.Static
RUNTIME_DEPENDENCIES
Gem::ScriptCanvas
)
################################################################################
Gems/ScriptCanvasTesting/Code/CMakeLists.txt
+5
View File
@@ -45,6 +45,11 @@ ly_add_target(
*.ScriptCanvasGrammar.xml,ScriptCanvasGrammar_Source.jinja,$path/$fileprefix.generated.cpp
*.ScriptCanvasNodeable.xml,ScriptCanvasNodeable_Header.jinja,$path/$fileprefix.generated.h
*.ScriptCanvasNodeable.xml,ScriptCanvasNodeable_Source.jinja,$path/$fileprefix.generated.cpp
RUNTIME_DEPENDENCIES
Gem::ScriptCanvas
Gem::ScriptCanvasEditor
Gem::GraphCanvasWidgets
Gem::ScriptEvents
)
ly_add_target(
Gems/Twitch/Code/CMakeLists.txt
+2
View File
@@ -29,6 +29,8 @@ ly_add_target(
AZ::AzCore
Gem::HttpRequestor
3rdParty::AWSNativeSDK::Core
RUNTIME_DEPENDENCIES
Gem::HttpRequestor
)
ly_add_target(
Gems/Vegetation/Code/CMakeLists.txt
+2 -1
View File
@@ -27,9 +27,10 @@ ly_add_target(
PUBLIC
Legacy::CryCommon
Gem::LmbrCentral.Static
Gem::GradientSignal
Gem::SurfaceData.Static
Gem::AtomLyIntegration_CommonFeatures.Static
RUNTIME_DEPENDENCIES
Gem::GradientSignal
)
ly_add_target(
cmake/LYWrappers.cmake
-2
View File
@@ -400,8 +400,6 @@ function(ly_delayed_target_link_libraries)
target_link_libraries(${target} ${visibility} $<TARGET_PROPERTY:${item},INTERFACE_LINK_LIBRARIES>)
target_compile_definitions(${target} ${visibility} $<TARGET_PROPERTY:${item},INTERFACE_COMPILE_DEFINITIONS>)
target_compile_options(${target} ${visibility} $<TARGET_PROPERTY:${item},INTERFACE_COMPILE_OPTIONS>)
# Add it also as a manual dependency so runtime_dependencies walks it through
ly_add_dependencies(${target} ${item})
else()
ly_parse_third_party_dependencies(${item})
target_link_libraries(${target} ${visibility} ${item})