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

Pass on fixing LmbrCentral.Static dependencies

Browse Source
This commit is contained in:
pappeste
2021-05-27 10:30:11 -07:00
parent f1b688f435
commit 0dd8fce2b0
12 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AudioEngineWwise/Code/CMakeLists.txt
+1 -1
View File
@@ -207,8 +207,8 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
Legacy::EditorCore
PUBLIC
AZ::AssetBuilderSDK
Gem::AudioSystem.Editor.Static
Gem::AudioEngineWwise.Static
Gem::AudioSystem.Editor
RUNTIME_DEPENDENCIES
Gem::AudioSystem.Editor
)
Gems/AutomatedLauncherTesting/Code/CMakeLists.txt
+1 -1
View File
@@ -23,7 +23,7 @@ ly_add_target(
PUBLIC
AZ::AzCore
Legacy::CryCommon
Gem::LmbrCentral.Static
Gem::LmbrCentral
)
ly_add_target(
Gems/EMotionFX/Code/CMakeLists.txt
+1 -1
View File
@@ -36,10 +36,10 @@ ly_add_target(
AZ::AzCore
AZ::AzFramework
Legacy::CryCommon
Gem::LmbrCentral.Static
PUBLIC
AZ::AtomCore
Gem::Atom_RPI.Public
Gem::LmbrCentral
COMPILE_DEFINITIONS
PUBLIC
EMFX_DEVELOPMENT_BUILD
Gems/FastNoise/Code/CMakeLists.txt
+7 -3
View File
@@ -23,7 +23,8 @@ ly_add_target(
PUBLIC
Legacy::CryCommon
Gem::GradientSignal
Gem::LmbrCentral.Static
PRIVATE
Gem::LmbrCentral
)
ly_add_target(
@@ -61,6 +62,8 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
PUBLIC
Include
BUILD_DEPENDENCIES
PRIVATE
Gem::LmbrCentral.Editor
PUBLIC
Gem::FastNoise.Static
AZ::AzToolsFramework
@@ -69,7 +72,6 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
ly_add_target(
NAME FastNoise.Editor GEM_MODULE
NAMESPACE Gem
FILES_CMAKE
fastnoise_editor_shared_files.cmake
@@ -80,7 +82,8 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
Include
BUILD_DEPENDENCIES
PRIVATE
FastNoise.Editor.Static
Gem::FastNoise.Editor.Static
Gem::LmbrCentral.Editor
RUNTIME_DEPENDENCIES
Gem::LmbrCentral.Editor
Gem::SurfaceData.Editor
@@ -113,6 +116,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
PRIVATE
AZ::AzTest
FastNoise.Editor.Static
Gem::LmbrCentral.Editor
)
ly_add_googletest(
NAME Gem::FastNoise.Editor.Tests
Gems/GradientSignal/Code/CMakeLists.txt
+8 -2
View File
@@ -22,9 +22,10 @@ ly_add_target(
BUILD_DEPENDENCIES
PUBLIC
Legacy::CryCommon
Gem::LmbrCentral.Static
Gem::SurfaceData
Gem::ImageProcessingAtom.Headers
PRIVATE
Gem::LmbrCentral
)
ly_add_target(
@@ -40,6 +41,7 @@ ly_add_target(
BUILD_DEPENDENCIES
PRIVATE
Gem::GradientSignal.Static
Gem::LmbrCentral
PUBLIC
Gem::ImageProcessingAtom.Headers # Atom/ImageProcessing/PixelFormats.h is part of a header in Includes
RUNTIME_DEPENDENCIES
@@ -66,6 +68,8 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
PUBLIC
GRADIENTSIGNAL_EDITOR
BUILD_DEPENDENCIES
PRIVATE
Gem::LmbrCentral.Editor
PUBLIC
3rdParty::Qt::Widgets
Legacy::CryCommon
@@ -79,7 +83,6 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
ly_add_target(
NAME GradientSignal.Editor GEM_MODULE
NAMESPACE Gem
FILES_CMAKE
gradientsignal_editor_shared_files.cmake
@@ -91,6 +94,7 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
BUILD_DEPENDENCIES
PRIVATE
Gem::GradientSignal.Editor.Static
Gem::LmbrCentral.Editor
RUNTIME_DEPENDENCIES
Gem::LmbrCentral.Editor
)
@@ -120,6 +124,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
PRIVATE
AZ::AzTest
Gem::GradientSignal.Static
Gem::LmbrCentral
)
ly_add_googletest(
NAME Gem::GradientSignal.Tests
@@ -140,6 +145,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
AZ::AzTest
Gem::GradientSignal.Static
Gem::GradientSignal.Editor.Static
Gem::LmbrCentral.Editor
)
ly_add_googletest(
NAME Gem::GradientSignal.Editor.Tests
Gems/ImGui/Code/CMakeLists.txt
+2 -1
View File
@@ -72,7 +72,8 @@ ly_add_target(
BUILD_DEPENDENCIES
PUBLIC
Gem::ImGui.ImGuiLYUtils
Gem::LmbrCentral.Static
PRIVATE
Gem::LmbrCentral
)
ly_add_target(
Gems/LyShine/Code/CMakeLists.txt
+5 -3
View File
@@ -26,13 +26,13 @@ ly_add_target(
BUILD_DEPENDENCIES
PRIVATE
Legacy::CryCommon
Gem::LmbrCentral
PUBLIC
Gem::Atom_RPI.Public
Gem::Atom_Utils.Static
Gem::Atom_Bootstrap.Headers
Gem::AtomFont
Gem::LmbrCentral.Static
Gem::TextureAtlas
Gem::TextureAtlas
)
ly_add_target(
@@ -49,6 +49,7 @@ ly_add_target(
PRIVATE
Gem::LyShine.Static
Legacy::CryCommon
Gem::LmbrCentral
RUNTIME_DEPENDENCIES
Gem::LmbrCentral
Gem::TextureAtlas
@@ -86,7 +87,7 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
Legacy::EditorCore
Gem::LyShine.Static
Legacy::CryCommon
Gem::LmbrCentral.Editor.Static
Gem::LmbrCentral.Editor
Gem::TextureAtlas.Editor
Gem::AtomToolsFramework.Static
Gem::AtomToolsFramework.Editor
@@ -152,6 +153,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
AZ::AzTest
Gem::LyShine.Static
Legacy::CryCommon
Gem::LmbrCentral
RUNTIME_DEPENDENCIES
Gem::LmbrCentral
Gem::TextureAtlas
Gems/LyShineExamples/Code/CMakeLists.txt
+1 -1
View File
@@ -22,7 +22,7 @@ ly_add_target(
BUILD_DEPENDENCIES
PUBLIC
Legacy::CryCommon
Gem::LmbrCentral.Static
Gem::LmbrCentral
Gem::LyShine.Static
)
Gems/PhysX/Code/CMakeLists.txt
+5 -2
View File
@@ -46,7 +46,8 @@ ly_add_target(
AZ::AzCore
AZ::AzFramework
Legacy::CryCommon
Gem::LmbrCentral.Static
PRIVATE
Gem::LmbrCentral
)
ly_add_target(
@@ -66,6 +67,7 @@ ly_add_target(
BUILD_DEPENDENCIES
PRIVATE
Gem::PhysX.Static
Gem::LmbrCentral
RUNTIME_DEPENDENCIES
Gem::LmbrCentral
)
@@ -111,7 +113,7 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
AZ::SceneCore
AZ::SceneData
Legacy::CryCommon
Gem::LmbrCentral.Editor.Static
Gem::LmbrCentral.Editor
Gem::PhysX.NumericalMethods
Gem::PhysX.Static
Gem::AtomLyIntegration_CommonFeatures.Static
@@ -165,6 +167,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
AZ::AzTestShared
AZ::AzTest
Gem::PhysX.Static
Gem::LmbrCentral
RUNTIME_DEPENDENCIES
Gem::LmbrCentral
)
Gems/StartingPointCamera/Code/CMakeLists.txt
+1 -1
View File
@@ -23,7 +23,7 @@ ly_add_target(
PRIVATE
AZ::AzCore
Gem::CameraFramework.Static
Gem::LmbrCentral.Static
Gem::LmbrCentral
Legacy::CryCommon
)
Gems/SurfaceData/Code/CMakeLists.txt
+4 -1
View File
@@ -22,10 +22,10 @@ ly_add_target(
BUILD_DEPENDENCIES
PRIVATE
Legacy::CryCommon
Gem::LmbrCentral
PUBLIC
Gem::Atom_RPI.Public
Gem::Atom_Feature_Common.Static
Gem::LmbrCentral.Static
)
ly_add_target(
@@ -42,6 +42,7 @@ ly_add_target(
PRIVATE
Legacy::CryCommon
Gem::SurfaceData.Static
Gem::LmbrCentral
RUNTIME_DEPENDENCIES
Gem::LmbrCentral
)
@@ -71,6 +72,7 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
Legacy::CryCommon
AZ::AzToolsFramework
Gem::SurfaceData.Static
Gem::LmbrCentral.Editor
RUNTIME_DEPENDENCIES
Gem::LmbrCentral.Editor
)
@@ -100,6 +102,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED)
AZ::AzTest
Legacy::CryCommon
Gem::SurfaceData.Static
Gem::LmbrCentral
)
ly_add_googletest(
NAME Gem::SurfaceData.Tests
Gems/Vegetation/Code/CMakeLists.txt
+3 -2
View File
@@ -24,10 +24,11 @@ ly_add_target(
PUBLIC
Include
BUILD_DEPENDENCIES
PRIVATE
Gem::LmbrCentral
Gem::SurfaceData
PUBLIC
Legacy::CryCommon
Gem::LmbrCentral.Static
Gem::SurfaceData.Static
Gem::AtomLyIntegration_CommonFeatures.Static
RUNTIME_DEPENDENCIES
Gem::GradientSignal