Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere

Gems/Multiplayer/Code/CMakeLists.txt

@@ -58,9 +58,35 @@ ly_add_target(
         Gem::CertificateManager
 )
 
+ly_add_target(
+    NAME Multiplayer.Debug ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
+    NAMESPACE Gem
+    FILES_CMAKE
+        multiplayer_debug_files.cmake
+    INCLUDE_DIRECTORIES
+        PRIVATE
+            Source
+            .
+        PUBLIC
+            Include
+    BUILD_DEPENDENCIES
+        PRIVATE
+            AZ::AzCore
+            AZ::AtomCore
+            AZ::AzFramework
+            AZ::AzNetworking
+            Gem::Atom_Feature_Common.Static
+            Gem::Multiplayer.Static
+            Gem::ImGui.Static
+)
+
+# 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
@@ -80,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
@@ -94,7 +122,7 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
                 Include
         BUILD_DEPENDENCIES
             PRIVATE
-                Gem::Multiplayer.Tools.Static
+                Gem::Multiplayer.Builders.Static
     )
 
     ly_add_target(
@@ -121,9 +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 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)
@@ -151,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
@@ -165,33 +195,11 @@ 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()
 
 endif()
-
-ly_add_target(
-    NAME Multiplayer.Debug ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
-    NAMESPACE Gem
-    FILES_CMAKE
-        multiplayer_debug_files.cmake
-    INCLUDE_DIRECTORIES
-        PRIVATE
-            Source
-            .
-        PUBLIC
-            Include
-    BUILD_DEPENDENCIES
-        PRIVATE
-            AZ::AzCore
-            AZ::AtomCore
-            AZ::AzFramework
-            AZ::AzNetworking
-            Gem::Atom_Feature_Common.Static
-            Gem::Multiplayer.Static
-            Gem::ImGui.Static
-)