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

Merge commit '2fa3c134e04c89b61b1e47bf0b44bdc74b840866' into amzn-tommy/gitflow_211116_o3de2

Browse Source
This commit is contained in:
Tommy Walton
2021-11-16 11:41:55 -08:00
parent 841c55c831 2fa3c134e0
commit 81a2f565c9
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Terrain/Code/CMakeLists.txt
+5 -7
View File
@@ -26,8 +26,6 @@ ly_add_target(
Gem::GradientSignal
Gem::SurfaceData
Gem::LmbrCentral
)
ly_add_target(
@@ -49,14 +47,14 @@ ly_add_target(
)
# the above module is for use in all client/server types
ly_create_alias(NAME Terrain.Servers NAMESPACE Gem TARGETS Gem::Terrain)
ly_create_alias(NAME Terrain.Clients NAMESPACE Gem TARGETS Gem::Terrain)
ly_create_alias(NAME Terrain.Servers NAMESPACE Gem TARGETS Gem::Terrain Gem::SurfaceData.Servers Gem::GradientSignal.Servers)
ly_create_alias(NAME Terrain.Clients NAMESPACE Gem TARGETS Gem::Terrain Gem::SurfaceData.Clients Gem::GradientSignal.Clients)
# If we are on a host platform, we want to add the host tools targets like the Terrain.Editor target which
# will also depend on Terrain.Static
if(PAL_TRAIT_BUILD_HOST_TOOLS)
ly_add_target(
NAME Terrain.Editor MODULE
NAME Terrain.Editor GEM_MODULE
NAMESPACE Gem
AUTOMOC
FILES_CMAKE
@@ -78,8 +76,8 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
)
# the above module is for use in dev tool situations
ly_create_alias(NAME Terrain.Builders NAMESPACE Gem TARGETS Gem::Terrain.Editor)
ly_create_alias(NAME Terrain.Tools NAMESPACE Gem TARGETS Gem::Terrain.Editor)
ly_create_alias(NAME Terrain.Builders NAMESPACE Gem TARGETS Gem::Terrain.Editor Gem::SurfaceData.Builders Gem::GradientSignal.Builders)
ly_create_alias(NAME Terrain.Tools NAMESPACE Gem TARGETS Gem::Terrain.Editor Gem::SurfaceData.Tools Gem::GradientSignal.Tools)
endif()
################################################################################