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
main
pappeste 5 years ago
parent db0db5c1c0
commit 19adbf2f41
21 changed files with 76 additions and 31 deletions
Show Stats Download Patch File Download Diff File

5
Code/Sandbox/Editor/CMakeLists.txt
Unescape Escape View File

@ -129,6 +129,8 @@ ly_add_target(
3rdParty::AWSNativeSDK::Core 3rdParty::AWSNativeSDK::Core
3rdParty::Qt::Network 3rdParty::Qt::Network
Legacy::EditorCore Legacy::EditorCore
RUNTIME_DEPENDENCIES
Gem::AtomViewportDisplayInfo
) )
ly_add_source_properties( ly_add_source_properties(
SOURCES CryEdit.cpp SOURCES CryEdit.cpp
@ -243,7 +245,8 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
Legacy::CryCommon Legacy::CryCommon
AZ::AzToolsFramework AZ::AzToolsFramework
Legacy::EditorLib Legacy::EditorLib
Gem::LmbrCentral RUNTIME_DEPENDENCIES
Gem::LmbrCentral
) )
ly_add_googletest( ly_add_googletest(
NAME Legacy::EditorLib.Tests NAME Legacy::EditorLib.Tests

5
Code/Sandbox/Plugins/ComponentEntityEditorPlugin/CMakeLists.txt
Unescape Escape View File

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

14
Gems/AWSClientAuth/Code/CMakeLists.txt
Unescape Escape View File

@ -29,6 +29,9 @@ ly_add_target(
Gem::HttpRequestor Gem::HttpRequestor
3rdParty::AWSNativeSDK::AWSClientAuth 3rdParty::AWSNativeSDK::AWSClientAuth
3rdParty::AWSNativeSDK::Core 3rdParty::AWSNativeSDK::Core
RUNTIME_DEPENDENCIES
Gem::AWSCore
Gem::HttpRequestor
) )
ly_add_target( ly_add_target(
@ -44,11 +47,13 @@ ly_add_target(
AZ::AzCore AZ::AzCore
AZ::AzFramework AZ::AzFramework
Gem::AWSCore Gem::AWSCore
Gem::HttpRequestor
3rdParty::AWSNativeSDK::AWSClientAuth 3rdParty::AWSNativeSDK::AWSClientAuth
3rdParty::AWSNativeSDK::Core 3rdParty::AWSNativeSDK::Core
PUBLIC PUBLIC
Gem::AWSClientAuth.Static Gem::AWSClientAuth.Static
RUNTIME_DEPENDENCIES
Gem::AWSCore
Gem::HttpRequestor
) )
################################################################################ ################################################################################
@ -71,10 +76,11 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
3rdParty::AWSNativeSDK::AWSClientAuth 3rdParty::AWSNativeSDK::AWSClientAuth
AZ::AzCore AZ::AzCore
AZ::AzFramework AZ::AzFramework
Gem::AWSCore
Gem::AWSClientAuth.Static Gem::AWSClientAuth.Static
AZ::AWSNativeSDKInit RUNTIUME_DEPENDENCIES
Gem::HttpRequestor Gem::AWSCore
AZ::AWSNativeSDKInit
Gem::HttpRequestor
) )
ly_add_googletest( ly_add_googletest(
NAME Gem::AWSClientAuth.Tests NAME Gem::AWSClientAuth.Tests

7
Gems/AWSMetrics/Code/CMakeLists.txt
Unescape Escape View File

@ -23,6 +23,7 @@ ly_add_target(
PRIVATE PRIVATE
AZ::AzCore AZ::AzCore
AZ::AzFramework AZ::AzFramework
PUBLIC
Gem::AWSCore Gem::AWSCore
) )
@ -40,8 +41,9 @@ ly_add_target(
PRIVATE PRIVATE
AZ::AzCore AZ::AzCore
AZ::AzFramework AZ::AzFramework
Gem::AWSCore
Gem::AWSMetrics.Static Gem::AWSMetrics.Static
RUNTIME_DEPENDENCIES
Gem::AWSCore
) )
################################################################################ ################################################################################
@ -63,8 +65,9 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
AZ::AzTest AZ::AzTest
AZ::AzCore AZ::AzCore
AZ::AzFramework AZ::AzFramework
Gem::AWSCore
Gem::AWSMetrics.Static Gem::AWSMetrics.Static
RUNTIME_DEPENDENCIES
Gem::AWSCore
) )
ly_add_googletest( ly_add_googletest(
NAME Gem::AWSMetrics.Tests NAME Gem::AWSMetrics.Tests

3
Gems/AudioEngineWwise/Code/CMakeLists.txt
Unescape Escape View File

@ -205,7 +205,8 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
PUBLIC PUBLIC
AZ::AssetBuilderSDK AZ::AssetBuilderSDK
Gem::AudioEngineWwise.Static Gem::AudioEngineWwise.Static
Gem::AudioSystem.Editor RUNTIME_DEPENDENCIES
Gem::AudioSystem.Editor
) )
ly_add_target( ly_add_target(

3
Gems/AudioSystem/Code/CMakeLists.txt
Unescape Escape View File

@ -101,7 +101,8 @@ if (PAL_TRAIT_BUILD_TESTS_SUPPORTED)
AZ::AzFramework AZ::AzFramework
Legacy::CryCommon Legacy::CryCommon
Gem::AudioSystem.Static Gem::AudioSystem.Static
Gem::LmbrCentral RUNTIME_DEPENDENCIES
Gem::LmbrCentral
) )
ly_add_googletest( ly_add_googletest(
NAME Gem::AudioSystem.Tests NAME Gem::AudioSystem.Tests

4
Gems/GameStateSamples/Code/CMakeLists.txt
Unescape Escape View File

@ -44,4 +44,8 @@ ly_add_target(
AZ::AzFramework AZ::AzFramework
Gem::LmbrCentral Gem::LmbrCentral
Gem::GameStateSamples.Headers Gem::GameStateSamples.Headers
RUNTIME_DEPENDENCIES
Gem::GameState
Gem::LocalUser
Gem::LmbrCentral
) )

7
Gems/GradientSignal/Code/CMakeLists.txt
Unescape Escape View File

@ -44,7 +44,6 @@ ly_add_target(
Gem::ImageProcessingAtom.Headers # Atom/ImageProcessing/PixelFormats.h is part of a header in Includes Gem::ImageProcessingAtom.Headers # Atom/ImageProcessing/PixelFormats.h is part of a header in Includes
RUNTIME_DEPENDENCIES RUNTIME_DEPENDENCIES
Gem::LmbrCentral Gem::LmbrCentral
Gem::SurfaceData
) )
if(PAL_TRAIT_BUILD_HOST_TOOLS) if(PAL_TRAIT_BUILD_HOST_TOOLS)
@ -67,10 +66,11 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
3rdParty::Qt::Widgets 3rdParty::Qt::Widgets
Legacy::CryCommon Legacy::CryCommon
AZ::AzToolsFramework AZ::AzToolsFramework
Gem::LmbrCentral.Editor
Gem::SurfaceData
AZ::AssetBuilderSDK AZ::AssetBuilderSDK
Gem::GradientSignal.Static Gem::GradientSignal.Static
Gem::SurfaceData
RUNTIME_DEPENDENCIES
Gem::LmbrCentral.Editor
) )
ly_add_target( ly_add_target(
@ -89,7 +89,6 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
Gem::GradientSignal.Editor.Static Gem::GradientSignal.Editor.Static
RUNTIME_DEPENDENCIES RUNTIME_DEPENDENCIES
Gem::LmbrCentral.Editor Gem::LmbrCentral.Editor
Gem::SurfaceData.Editor
) )
endif() endif()

1
Gems/GraphCanvas/Code/CMakeLists.txt
Unescape Escape View File

@ -51,7 +51,6 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
ly_add_target( ly_add_target(
NAME GraphCanvas.Editor GEM_MODULE NAME GraphCanvas.Editor GEM_MODULE
NAMESPACE Gem NAMESPACE Gem
AUTOMOC AUTOMOC
AUTORCC AUTORCC

2
Gems/ImGui/Code/CMakeLists.txt
Unescape Escape View File

@ -53,6 +53,8 @@ ly_add_target(
PUBLIC PUBLIC
Gem::ImGui.imguilib Gem::ImGui.imguilib
Legacy::CryCommon Legacy::CryCommon
RUNTIME_DEPENDENCIES
Gem::ImGui.imguilib
) )
ly_add_target( ly_add_target(

15
Gems/LandscapeCanvas/Code/CMakeLists.txt
Unescape Escape View File

@ -35,16 +35,21 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
Legacy::CryCommon Legacy::CryCommon
Legacy::Editor.Headers Legacy::Editor.Headers
Legacy::EditorCommon Legacy::EditorCommon
Gem::LmbrCentral.Editor
Gem::GraphCanvasWidgets
Gem::GraphModel.Editor.Static Gem::GraphModel.Editor.Static
Gem::GradientSignal.Editor Gem::GradientSignal.Editor
Gem::SurfaceData.Editor Gem::SurfaceData.Editor
Gem::Vegetation.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( ly_add_target(
NAME LandscapeCanvas.Editor GEM_MODULE NAME LandscapeCanvas.Editor GEM_MODULE
NAMESPACE Gem NAMESPACE Gem
FILES_CMAKE FILES_CMAKE
landscapecanvas_editor_files.cmake landscapecanvas_editor_files.cmake
@ -61,7 +66,6 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
AZ::AzCore AZ::AzCore
AZ::AzToolsFramework AZ::AzToolsFramework
Legacy::Editor.Headers Legacy::Editor.Headers
Gem::GraphCanvasWidgets
Gem::GraphModel.Editor.Static Gem::GraphModel.Editor.Static
Gem::LandscapeCanvas.Editor.Static Gem::LandscapeCanvas.Editor.Static
RUNTIME_DEPENDENCIES RUNTIME_DEPENDENCIES
@ -97,9 +101,10 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
AZ::AzTest AZ::AzTest
AZ::AzFramework AZ::AzFramework
AZ::AzToolsFramework AZ::AzToolsFramework
Gem::GraphCanvasWidgets
Gem::GraphModel.Editor.Static Gem::GraphModel.Editor.Static
Gem::LandscapeCanvas.Editor.Static Gem::LandscapeCanvas.Editor.Static
RUNTIME_DEPENDENCIES
Gem::GraphCanvasWidgets
) )
ly_add_googletest( ly_add_googletest(
NAME Gem::LandscapeCanvas.Editor.Tests NAME Gem::LandscapeCanvas.Editor.Tests

12
Gems/LyShine/Code/CMakeLists.txt
Unescape Escape View File

@ -92,6 +92,8 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
Gem::Atom_RPI.Public Gem::Atom_RPI.Public
Gem::Atom_Utils.Static Gem::Atom_Utils.Static
Gem::Atom_Bootstrap.Headers Gem::Atom_Bootstrap.Headers
RUNTIME_DEPENDENCIES
Gem::TextureAtlas
) )
ly_add_target( ly_add_target(
@ -143,8 +145,9 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
AZ::AzTest AZ::AzTest
Gem::LyShine.Static Gem::LyShine.Static
Legacy::CryCommon Legacy::CryCommon
Gem::LmbrCentral RUNTIME_DEPENDENCIES
Gem::TextureAtlas Gem::LmbrCentral
Gem::TextureAtlas
) )
ly_add_googletest( ly_add_googletest(
NAME Gem::LyShine.Tests NAME Gem::LyShine.Tests
@ -173,9 +176,10 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
AZ::AzTest AZ::AzTest
Legacy::CryCommon Legacy::CryCommon
AZ::AssetBuilderSDK AZ::AssetBuilderSDK
Gem::LmbrCentral.Editor
Gem::TextureAtlas
Gem::LyShine.Editor.Static Gem::LyShine.Editor.Static
RUNTIME_DEPENDENCIES
Gem::LmbrCentral.Editor
Gem::TextureAtlas
) )
ly_add_googletest( ly_add_googletest(
NAME Gem::LyShine.Editor.Tests NAME Gem::LyShine.Editor.Tests

4
Gems/PhysXDebug/Code/CMakeLists.txt
Unescape Escape View File

@ -66,9 +66,9 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
Legacy::CryCommon Legacy::CryCommon
Legacy::Editor.Headers Legacy::Editor.Headers
AZ::AzToolsFramework AZ::AzToolsFramework
Gem::PhysX Gem::PhysX.Editor
Gem::ImGui.imguilib Gem::ImGui.imguilib
Gem::ImGui Gem::ImGui.Editor
RUNTIME_DEPENDENCIES RUNTIME_DEPENDENCIES
Gem::PhysX.Editor Gem::PhysX.Editor
Gem::ImGui.Editor Gem::ImGui.Editor

3
Gems/SceneProcessing/Code/CMakeLists.txt
Unescape Escape View File

@ -84,7 +84,8 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
BUILD_DEPENDENCIES BUILD_DEPENDENCIES
PRIVATE PRIVATE
AZ::AzTest AZ::AzTest
Gem::SceneProcessing RUNTIME_DEPENDENCIES
Gem::SceneProcessing
) )
ly_add_googletest( ly_add_googletest(
NAME Gem::SceneProcessing.Tests NAME Gem::SceneProcessing.Tests

7
Gems/ScriptCanvas/Code/CMakeLists.txt
Unescape Escape View File

@ -81,6 +81,8 @@ ly_add_target(
*.ScriptCanvasGrammar.xml,ScriptCanvasGrammar_Source.jinja,$path/$fileprefix.generated.cpp *.ScriptCanvasGrammar.xml,ScriptCanvasGrammar_Source.jinja,$path/$fileprefix.generated.cpp
*.ScriptCanvasNodeable.xml,ScriptCanvasNodeable_Header.jinja,$path/$fileprefix.generated.h *.ScriptCanvasNodeable.xml,ScriptCanvasNodeable_Header.jinja,$path/$fileprefix.generated.h
*.ScriptCanvasNodeable.xml,ScriptCanvasNodeable_Source.jinja,$path/$fileprefix.generated.cpp *.ScriptCanvasNodeable.xml,ScriptCanvasNodeable_Source.jinja,$path/$fileprefix.generated.cpp
RUNTIME_DEPENDENCIES
Gem::ScriptCanvasDebugger
) )
ly_add_target( ly_add_target(
@ -170,6 +172,8 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
Gem::ExpressionEvaluation.Static Gem::ExpressionEvaluation.Static
PRIVATE PRIVATE
Legacy::EditorCore Legacy::EditorCore
RUNTIME_DEPENDENCIES
Gem::ScriptCanvas
) )
ly_add_target( ly_add_target(
@ -228,7 +232,8 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
PRIVATE PRIVATE
AZ::AzTest AZ::AzTest
AZ::AzFramework AZ::AzFramework
Gem::ScriptCanvas RUNTIME_DEPENDENCIES
Gem::ScriptCanvas
) )
ly_add_googletest( ly_add_googletest(
NAME Gem::ScriptCanvas.Tests NAME Gem::ScriptCanvas.Tests

1
Gems/ScriptCanvasDeveloper/Code/CMakeLists.txt
Unescape Escape View File

@ -81,5 +81,6 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
Gem::GraphCanvasWidgets Gem::GraphCanvasWidgets
RUNTIME_DEPENDENCIES RUNTIME_DEPENDENCIES
Gem::ScriptCanvas.Editor Gem::ScriptCanvas.Editor
Gem::GraphCanvasWidgets
) )
endif() endif()

2
Gems/ScriptCanvasPhysics/Code/CMakeLists.txt
Unescape Escape View File

@ -36,6 +36,8 @@ ly_add_target(
PRIVATE PRIVATE
Legacy::CryCommon Legacy::CryCommon
Gem::ScriptCanvasPhysics.Static Gem::ScriptCanvasPhysics.Static
RUNTIME_DEPENDENCIES
Gem::ScriptCanvas
) )
################################################################################ ################################################################################

5
Gems/ScriptCanvasTesting/Code/CMakeLists.txt
Unescape Escape View File

@ -45,6 +45,11 @@ ly_add_target(
*.ScriptCanvasGrammar.xml,ScriptCanvasGrammar_Source.jinja,$path/$fileprefix.generated.cpp *.ScriptCanvasGrammar.xml,ScriptCanvasGrammar_Source.jinja,$path/$fileprefix.generated.cpp
*.ScriptCanvasNodeable.xml,ScriptCanvasNodeable_Header.jinja,$path/$fileprefix.generated.h *.ScriptCanvasNodeable.xml,ScriptCanvasNodeable_Header.jinja,$path/$fileprefix.generated.h
*.ScriptCanvasNodeable.xml,ScriptCanvasNodeable_Source.jinja,$path/$fileprefix.generated.cpp *.ScriptCanvasNodeable.xml,ScriptCanvasNodeable_Source.jinja,$path/$fileprefix.generated.cpp
RUNTIME_DEPENDENCIES
Gem::ScriptCanvas
Gem::ScriptCanvasEditor
Gem::GraphCanvasWidgets
Gem::ScriptEvents
) )
ly_add_target( ly_add_target(

2
Gems/Twitch/Code/CMakeLists.txt
Unescape Escape View File

@ -29,6 +29,8 @@ ly_add_target(
AZ::AzCore AZ::AzCore
Gem::HttpRequestor Gem::HttpRequestor
3rdParty::AWSNativeSDK::Core 3rdParty::AWSNativeSDK::Core
RUNTIME_DEPENDENCIES
Gem::HttpRequestor
) )
ly_add_target( ly_add_target(

3
Gems/Vegetation/Code/CMakeLists.txt
Unescape Escape View File

@ -27,9 +27,10 @@ ly_add_target(
PUBLIC PUBLIC
Legacy::CryCommon Legacy::CryCommon
Gem::LmbrCentral.Static Gem::LmbrCentral.Static
Gem::GradientSignal
Gem::SurfaceData.Static Gem::SurfaceData.Static
Gem::AtomLyIntegration_CommonFeatures.Static Gem::AtomLyIntegration_CommonFeatures.Static
RUNTIME_DEPENDENCIES
Gem::GradientSignal
) )
ly_add_target( ly_add_target(

2
cmake/LYWrappers.cmake
Unescape Escape View File

@ -400,8 +400,6 @@ function(ly_delayed_target_link_libraries)
target_link_libraries(${target} ${visibility} $<TARGET_PROPERTY:${item},INTERFACE_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_definitions(${target} ${visibility} $<TARGET_PROPERTY:${item},INTERFACE_COMPILE_DEFINITIONS>)
target_compile_options(${target} ${visibility} $<TARGET_PROPERTY:${item},INTERFACE_COMPILE_OPTIONS>) 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() else()
ly_parse_third_party_dependencies(${item}) ly_parse_third_party_dependencies(${item})
target_link_libraries(${target} ${visibility} ${item}) target_link_libraries(${target} ${visibility} ${item})

Write Preview
Loading…
Cancel
Save