Merge pull request #589 from aws-lumberyard-dev/Atom/olexl/ATOM-15376

Gem::AtomBridge now contains all the runtime/tool deps for projects that wish to use Atom renderer
2021-05-11 19:28:56 -04:00
parent 7f5962d1ba 93ef3acb50
commit 6b2a750f3d
18 changed files with 183 additions and 44 deletions
@@ -10,6 +10,4 @@
 #

 set(GEM_DEPENDENCIES
-    Gem::Atom_RHI_Metal.Private
-    Gem::Atom_RHI_Null.Private
 )
@@ -10,10 +10,4 @@
 #

 set(GEM_DEPENDENCIES
-    Gem::Atom_RHI_Null.Private
-    Gem::Atom_RHI_Null.Builders
-    Gem::Atom_RHI_Metal.Private
-    Gem::Atom_RHI_Metal.Builders
-    Gem::Atom_RHI_Vulkan.Builders
-    Gem::Atom_RHI_DX12.Builders
 )
@@ -10,7 +10,4 @@
 #

 set(GEM_DEPENDENCIES
-    Gem::Atom_RHI_Vulkan.Private
-    Gem::Atom_RHI_DX12.Private
-    Gem::Atom_RHI_Null.Private
 )
@@ -11,11 +11,4 @@

 set(GEM_DEPENDENCIES
    Gem::QtForPython.Editor
-    Gem::Atom_RHI_Vulkan.Private
-    Gem::Atom_RHI_Vulkan.Builders
-    Gem::Atom_RHI_DX12.Private
-    Gem::Atom_RHI_DX12.Builders
-    Gem::Atom_RHI_Null.Private
-    Gem::Atom_RHI_Null.Builders
-    Gem::Atom_RHI_Metal.Builders
 )
@@ -42,17 +42,7 @@ set(GEM_DEPENDENCIES
    Gem::SurfaceData
    Gem::GradientSignal
    Gem::Vegetation
-    Gem::Atom_RHI.Private
-    Gem::Atom_RPI.Private
-    Gem::Atom_Feature_Common
-    Gem::Atom_Bootstrap
-    Gem::Atom_Component_DebugCamera
-    Gem::AtomImGuiTools
-    Gem::AtomLyIntegration_CommonFeatures
-    Gem::EMotionFX_Atom
-    Gem::ImguiAtom
    Gem::Atom_AtomBridge
-    Gem::AtomFont
    Gem::NvCloth
    Gem::Blast
 )
@@ -50,24 +50,9 @@ set(GEM_DEPENDENCIES
    Gem::Vegetation.Editor
    Gem::GraphModel.Editor
    Gem::LandscapeCanvas.Editor
-    Gem::Atom_RHI.Private
    Gem::EMotionFX.Editor
-    Gem::Atom_RPI.Builders
-    Gem::Atom_RPI.Editor
-    Gem::Atom_Feature_Common.Builders
-    Gem::Atom_Feature_Common.Editor
    Gem::ImGui.Editor
-    Gem::Atom_Bootstrap
-    Gem::Atom_Asset_Shader.Builders
-    Gem::Atom_Component_DebugCamera
-    Gem::AtomImGuiTools
-    Gem::AtomLyIntegration_CommonFeatures.Editor
-    Gem::EMotionFX_Atom.Editor
-    Gem::ImageProcessingAtom.Editor
    Gem::Atom_AtomBridge.Editor
-    Gem::ImguiAtom
-    Gem::AtomFont
-    Gem::AtomToolsFramework.Editor
    Gem::NvCloth.Editor
    Gem::Blast.Editor
 )
@@ -89,7 +89,7 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
    )

   ly_add_target(
-        NAME Atom_RHI_Null.Builders MODULE
+        NAME Atom_RHI_Null.Builders GEM_MODULE
        NAMESPACE Gem
        FILES_CMAKE
            atom_rhi_null_builders_shared_files.cmake
@@ -9,6 +9,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #

+ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Source/Platform/${PAL_PLATFORM_NAME})
+
 ly_add_target(
    NAME Atom_AtomBridge.Static STATIC
    NAMESPACE Gem
@@ -41,12 +43,26 @@ ly_add_target(
            Source
        PUBLIC
            Include
+    PLATFORM_INCLUDE_FILES
+        ${pal_dir}/additional_${PAL_PLATFORM_NAME_LOWERCASE}_runtime_deps.cmake
    COMPILE_DEFINITIONS
        PRIVATE
            ENABLE_ATOM_DEBUG_DISPLAY=1
    BUILD_DEPENDENCIES
        PRIVATE
            Gem::Atom_AtomBridge.Static
+    RUNTIME_DEPENDENCIES
+        Gem::Atom_RHI.Private
+        Gem::Atom_RPI.Private
+        Gem::Atom_RHI_Null.Private
+        Gem::Atom_Feature_Common
+        Gem::Atom_Bootstrap
+        Gem::Atom_Component_DebugCamera
+        Gem::AtomImGuiTools
+        Gem::AtomLyIntegration_CommonFeatures
+        Gem::EMotionFX_Atom
+        Gem::ImguiAtom
+        Gem::AtomFont
 )

 if(PAL_TRAIT_BUILD_HOST_TOOLS)
@@ -60,6 +76,8 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
                Source
            PUBLIC
                Include
+        PLATFORM_INCLUDE_FILES
+           ${pal_dir}/additional_${PAL_PLATFORM_NAME_LOWERCASE}_tool_deps.cmake
        COMPILE_DEFINITIONS
            PRIVATE
                EDITOR
@@ -68,5 +86,23 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
                AZ::AssetBuilderSDK
                Gem::Atom_Utils.Static
                Gem::Atom_AtomBridge.Static
+        RUNTIME_DEPENDENCIES
+            Gem::Atom_RHI.Private
+            Gem::Atom_RPI.Builders
+            Gem::Atom_RPI.Editor
+            Gem::Atom_RHI_Null.Private
+            Gem::Atom_RHI_Null.Builders
+            Gem::Atom_Feature_Common.Builders
+            Gem::Atom_Feature_Common.Editor
+            Gem::Atom_Bootstrap
+            Gem::Atom_Asset_Shader.Builders
+            Gem::Atom_Component_DebugCamera
+            Gem::AtomImGuiTools
+            Gem::AtomLyIntegration_CommonFeatures.Editor
+            Gem::EMotionFX_Atom.Editor
+            Gem::ImageProcessingAtom.Editor
+            Gem::ImguiAtom
+            Gem::AtomFont
+            Gem::AtomToolsFramework.Editor
    )
 endif()
@@ -0,0 +1,14 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set(LY_RUNTIME_DEPENDENCIES
+    Gem::Atom_RHI_Vulkan.Private
+)
@@ -0,0 +1,13 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set(LY_RUNTIME_DEPENDENCIES
+)
@@ -0,0 +1,14 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set(LY_RUNTIME_DEPENDENCIES
+    Gem::Atom_RHI_Vulkan.Private
+)
@@ -0,0 +1,16 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set(LY_RUNTIME_DEPENDENCIES
+    Gem::Atom_RHI_Vulkan.Builders
+    Gem::Atom_RHI_DX12.Builders
+    Gem::Atom_RHI_Metal.Builders
+)
@@ -0,0 +1,14 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set(LY_RUNTIME_DEPENDENCIES
+    Gem::Atom_RHI_Metal.Private
+)
@@ -0,0 +1,16 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set(LY_RUNTIME_DEPENDENCIES
+    Gem::Atom_RHI_Metal.Builders
+    Gem::Atom_RHI_Vulkan.Builders
+    Gem::Atom_RHI_DX12.Builders
+)
@@ -0,0 +1,16 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set(LY_RUNTIME_DEPENDENCIES
+    Gem::Atom_RHI_Vulkan.Private
+    Gem::Atom_RHI_DX12.Private
+    Gem::Atom_RHI_Null.Private
+)
@@ -0,0 +1,16 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set(LY_RUNTIME_DEPENDENCIES
+    Gem::Atom_RHI_Vulkan.Builders
+    Gem::Atom_RHI_DX12.Builders
+    Gem::Atom_RHI_Metal.Builders
+)
@@ -0,0 +1,14 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set(LY_RUNTIME_DEPENDENCIES
+    Gem::Atom_RHI_Metal.Private
+)
@@ -0,0 +1,13 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set(LY_RUNTIME_DEPENDENCIES
+)