From e85b5a8c48c1e47ad00eab7c13f4be2bffef84e6 Mon Sep 17 00:00:00 2001
From: guthadam <guthadam@amazon.com>
Date: Wed, 9 Jun 2021 00:35:31 -0500
Subject: [PATCH] Fixing material editor startup and critical asset issues
 Added builder and tool aliases Added dependency to Atom Bridge

---
 Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt    |  5 +++++
 Gems/Atom/Tools/MaterialEditor/gem.json               | 10 ++++++++++
 Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt |  1 +
 3 files changed, 16 insertions(+)
 create mode 100644 Gems/Atom/Tools/MaterialEditor/gem.json

diff --git a/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt b/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt
index 134f605200..dddb339cfb 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt
+++ b/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt
@@ -113,6 +113,11 @@ ly_add_target(
             Gem::MaterialEditor.Document
 )
 
+# Add a 'builders' alias to allow the MaterialEditor root gem path to be added to the generated
+# cmake_dependencies.<project>.assetprocessor.setreg to allow the asset scan folder for it to be added
+ly_create_alias(NAME MaterialEditor.Builders NAMESPACE Gem)
+ly_create_alias(NAME MaterialEditor.Tools NAMESPACE Gem)
+
 # Add build dependency to Editor for the MaterialEditor application since
 # Editor opens up the MaterialEditor
 ly_add_dependencies(Editor Gem::MaterialEditor)
diff --git a/Gems/Atom/Tools/MaterialEditor/gem.json b/Gems/Atom/Tools/MaterialEditor/gem.json
new file mode 100644
index 0000000000..5113effc0a
--- /dev/null
+++ b/Gems/Atom/Tools/MaterialEditor/gem.json
@@ -0,0 +1,10 @@
+{
+    "gem_name": "MaterialEditor",
+    "display_name": "Atom Material Editor",
+    "summary": "Editor for creating, modifying, and previewing materials",
+    "canonical_tags": [
+        "Gem"
+    ],
+    "user_tags": [
+    ]
+}
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt b/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt
index 4df40e3d13..abc4dfb2c6 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt
@@ -111,6 +111,7 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
             Gem::AtomToolsFramework.Editor
             Gem::AtomViewportDisplayInfo
             Gem::AtomViewportDisplayIcons.Editor
+            Gem::MaterialEditor.Builders
     )