From e886dba77e1a91f11005529c9295ec7e7e7d3ac7 Mon Sep 17 00:00:00 2001
From: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
Date: Thu, 20 May 2021 15:27:54 -0700
Subject: [PATCH] Update Multiplayer gem to conform to the new standard

The multiplayer gem had a naming conflict in it - a module was called
"Tools".
---
 Gems/Multiplayer/Code/CMakeLists.txt | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Gems/Multiplayer/Code/CMakeLists.txt b/Gems/Multiplayer/Code/CMakeLists.txt
index 800670ff92..430fe5ca4b 100644
--- a/Gems/Multiplayer/Code/CMakeLists.txt
+++ b/Gems/Multiplayer/Code/CMakeLists.txt
@@ -80,14 +80,13 @@ ly_add_target(
             Gem::ImGui.Static
 )
 
-# The above "Multiplayer" target is used by clients and servers
-# the debug is only used on Clients
+# The  "Multiplayer" target is used by clients and servers, Debug is used only on clients.
 ly_create_alias(NAME Multiplayer.Clients NAMESPACE Gem TARGETS Gem::Multiplayer Gem::Multiplayer.Debug)
 ly_create_alias(NAME Multiplayer.Servers NAMESPACE Gem TARGETS Gem::Multiplayer)
 
 if (PAL_TRAIT_BUILD_HOST_TOOLS)
     ly_add_target(
-        NAME Multiplayer.Tools.Static STATIC
+        NAME Multiplayer.Builders.Static STATIC
         NAMESPACE Gem
         FILES_CMAKE
             multiplayer_tools_files.cmake
@@ -107,10 +106,12 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
                 Gem::Multiplayer.Static
     )
 
+    # by naming this target Multiplayer.Builders it ensures that it is loaded
+    # in any pipeline tools (Like Asset Processor, AssetBuilder, etc)
     ly_add_target(
-        NAME Multiplayer.Tools MODULE
+        NAME Multiplayer.Builders GEM_MODULE
         NAMESPACE Gem
-        OUTPUT_NAME Gem.Multiplayer.Tools
+        OUTPUT_NAME Gem.Multiplayer.Builders
         FILES_CMAKE
             multiplayer_tools_files.cmake
         INCLUDE_DIRECTORIES
@@ -121,7 +122,7 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
                 Include
         BUILD_DEPENDENCIES
             PRIVATE
-                Gem::Multiplayer.Tools.Static
+                Gem::Multiplayer.Builders.Static
     )
 
     ly_add_target(
@@ -148,12 +149,11 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
                 AZ::AzNetworking
                 AZ::AzToolsFramework
                 Gem::Multiplayer.Static
-                Gem::Multiplayer.Tools
+                Gem::Multiplayer.Builders
     )
 
-    # use the Multiplayer.Editor module in tools and builders.  Tools also get the visual debug view
-    ly_create_alias(NAME Multiplayer.Tools     NAMESPACE Gem TARGETS Gem::Multiplayer.Editor Gem::Multiplayer.Debug Gem::Multiplayer.PrefabProcessor)
-    ly_create_alias(NAME Multiplayer.Builders  NAMESPACE Gem TARGETS Gem::Multiplayer.Editor Gem::Multiplayer.PrefabProcessor)
+    # use the Multiplayer.Editor module in tools like the Editor:  Such tools also get the visual debug view:
+    ly_create_alias(NAME Multiplayer.Tools     NAMESPACE Gem TARGETS Gem::Multiplayer.Editor Gem::Multiplayer.Debug)
 endif()
 
 if (PAL_TRAIT_BUILD_TESTS_SUPPORTED)
@@ -181,7 +181,7 @@ if (PAL_TRAIT_BUILD_TESTS_SUPPORTED)
     
     if (PAL_TRAIT_BUILD_HOST_TOOLS)
         ly_add_target(
-            NAME Multiplayer.Tools.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
+            NAME Multiplayer.Builders.Tests ${PAL_TRAIT_TEST_TARGET_TYPE}
             NAMESPACE Gem
             FILES_CMAKE
                 multiplayer_tools_tests_files.cmake
@@ -195,10 +195,10 @@ if (PAL_TRAIT_BUILD_TESTS_SUPPORTED)
                     AZ::AzTest
                     AZ::AzTestShared
                     AZ::AzToolsFrameworkTestCommon
-                    Gem::Multiplayer.Tools.Static
+                    Gem::Multiplayer.Builders.Static
         )
         ly_add_googletest(
-            NAME Gem::Multiplayer.Tools.Tests
+            NAME Gem::Multiplayer.Builders.Tests
         )
     endif()