From 6dcc75ed78a6478796888c273f0ddb15fe8fb3ac Mon Sep 17 00:00:00 2001 From: Aristo7 <5432499+Aristo7@users.noreply.github.com> Date: Wed, 5 May 2021 14:43:41 -0500 Subject: [PATCH 1/7] AtomBridge contains all runtime deps now --- .../Platform/Mac/runtime_dependencies.cmake | 2 -- .../Code/Platform/Mac/tool_dependencies.cmake | 4 --- .../Windows/runtime_dependencies.cmake | 3 -- .../Platform/Windows/tool_dependencies.cmake | 7 ---- .../Gem/Code/runtime_dependencies.cmake | 10 ------ .../Gem/Code/tool_dependencies.cmake | 15 --------- .../AtomBridge/Code/CMakeLists.txt | 33 +++++++++++++++++++ .../additional_windows_runtime_deps.cmake | 14 ++++++++ .../additional_windows_tool_deps.cmake | 13 ++++++++ .../additional_windows_runtime_deps.cmake | 14 ++++++++ .../Linux/additional_windows_tool_deps.cmake | 15 +++++++++ .../Mac/additional_windows_runtime_deps.cmake | 14 ++++++++ .../Mac/additional_windows_tool_deps.cmake | 19 +++++++++++ .../additional_windows_runtime_deps.cmake | 16 +++++++++ .../additional_windows_tool_deps.cmake | 20 +++++++++++ .../iOS/additional_windows_runtime_deps.cmake | 14 ++++++++ .../iOS/additional_windows_tool_deps.cmake | 13 ++++++++ 17 files changed, 185 insertions(+), 41 deletions(-) create mode 100644 Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Android/additional_windows_runtime_deps.cmake create mode 100644 Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Android/additional_windows_tool_deps.cmake create mode 100644 Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_windows_runtime_deps.cmake create mode 100644 Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_windows_tool_deps.cmake create mode 100644 Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_windows_runtime_deps.cmake create mode 100644 Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_windows_tool_deps.cmake create mode 100644 Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Windows/additional_windows_runtime_deps.cmake create mode 100644 Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Windows/additional_windows_tool_deps.cmake create mode 100644 Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/iOS/additional_windows_runtime_deps.cmake create mode 100644 Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/iOS/additional_windows_tool_deps.cmake diff --git a/AutomatedTesting/Gem/Code/Platform/Mac/runtime_dependencies.cmake b/AutomatedTesting/Gem/Code/Platform/Mac/runtime_dependencies.cmake index f9d1e60dda..ffcaf7293a 100644 --- a/AutomatedTesting/Gem/Code/Platform/Mac/runtime_dependencies.cmake +++ b/AutomatedTesting/Gem/Code/Platform/Mac/runtime_dependencies.cmake @@ -10,6 +10,4 @@ # set(GEM_DEPENDENCIES - Gem::Atom_RHI_Metal.Private - Gem::Atom_RHI_Null.Private ) \ No newline at end of file diff --git a/AutomatedTesting/Gem/Code/Platform/Mac/tool_dependencies.cmake b/AutomatedTesting/Gem/Code/Platform/Mac/tool_dependencies.cmake index ee7be9ac6d..ffcaf7293a 100644 --- a/AutomatedTesting/Gem/Code/Platform/Mac/tool_dependencies.cmake +++ b/AutomatedTesting/Gem/Code/Platform/Mac/tool_dependencies.cmake @@ -10,8 +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 ) \ No newline at end of file diff --git a/AutomatedTesting/Gem/Code/Platform/Windows/runtime_dependencies.cmake b/AutomatedTesting/Gem/Code/Platform/Windows/runtime_dependencies.cmake index 0a1541bcfc..ffcaf7293a 100644 --- a/AutomatedTesting/Gem/Code/Platform/Windows/runtime_dependencies.cmake +++ b/AutomatedTesting/Gem/Code/Platform/Windows/runtime_dependencies.cmake @@ -10,7 +10,4 @@ # set(GEM_DEPENDENCIES - Gem::Atom_RHI_Vulkan.Private - Gem::Atom_RHI_DX12.Private - Gem::Atom_RHI_Null.Private ) \ No newline at end of file diff --git a/AutomatedTesting/Gem/Code/Platform/Windows/tool_dependencies.cmake b/AutomatedTesting/Gem/Code/Platform/Windows/tool_dependencies.cmake index ddd3bfa6a7..933dd7927b 100644 --- a/AutomatedTesting/Gem/Code/Platform/Windows/tool_dependencies.cmake +++ b/AutomatedTesting/Gem/Code/Platform/Windows/tool_dependencies.cmake @@ -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 ) \ No newline at end of file diff --git a/AutomatedTesting/Gem/Code/runtime_dependencies.cmake b/AutomatedTesting/Gem/Code/runtime_dependencies.cmake index c8e66740e4..da0a70b9cd 100644 --- a/AutomatedTesting/Gem/Code/runtime_dependencies.cmake +++ b/AutomatedTesting/Gem/Code/runtime_dependencies.cmake @@ -42,16 +42,6 @@ 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::Blast ) diff --git a/AutomatedTesting/Gem/Code/tool_dependencies.cmake b/AutomatedTesting/Gem/Code/tool_dependencies.cmake index 8c5da63f42..f0e73e8a11 100644 --- a/AutomatedTesting/Gem/Code/tool_dependencies.cmake +++ b/AutomatedTesting/Gem/Code/tool_dependencies.cmake @@ -50,23 +50,8 @@ 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::Blast.Editor ) diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt b/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt index b684e445b3..30861a6feb 100644 --- a/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt +++ b/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt @@ -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,25 @@ 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_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 +75,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 +85,21 @@ 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_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() diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Android/additional_windows_runtime_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Android/additional_windows_runtime_deps.cmake new file mode 100644 index 0000000000..31c0cab74b --- /dev/null +++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Android/additional_windows_runtime_deps.cmake @@ -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 +) diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Android/additional_windows_tool_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Android/additional_windows_tool_deps.cmake new file mode 100644 index 0000000000..99eec9a733 --- /dev/null +++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Android/additional_windows_tool_deps.cmake @@ -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 +) diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_windows_runtime_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_windows_runtime_deps.cmake new file mode 100644 index 0000000000..31c0cab74b --- /dev/null +++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_windows_runtime_deps.cmake @@ -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 +) diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_windows_tool_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_windows_tool_deps.cmake new file mode 100644 index 0000000000..8fb58f5e56 --- /dev/null +++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_windows_tool_deps.cmake @@ -0,0 +1,15 @@ +# +# 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_Vulkan.Builders +) diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_windows_runtime_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_windows_runtime_deps.cmake new file mode 100644 index 0000000000..a0aa67c703 --- /dev/null +++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_windows_runtime_deps.cmake @@ -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 +) diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_windows_tool_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_windows_tool_deps.cmake new file mode 100644 index 0000000000..0b601adf8d --- /dev/null +++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_windows_tool_deps.cmake @@ -0,0 +1,19 @@ +# +# 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 + Gem::Atom_RHI_Metal.Builders + Gem::Atom_RHI_Vulkan.Builders + Gem::Atom_RHI_DX12.Builders + Gem::Atom_RHI_Null.Private + Gem::Atom_RHI_Null.Builders +) diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Windows/additional_windows_runtime_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Windows/additional_windows_runtime_deps.cmake new file mode 100644 index 0000000000..dfd0319c05 --- /dev/null +++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Windows/additional_windows_runtime_deps.cmake @@ -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 +) diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Windows/additional_windows_tool_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Windows/additional_windows_tool_deps.cmake new file mode 100644 index 0000000000..e30a9737ac --- /dev/null +++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Windows/additional_windows_tool_deps.cmake @@ -0,0 +1,20 @@ +# +# 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_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 +) diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/iOS/additional_windows_runtime_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/iOS/additional_windows_runtime_deps.cmake new file mode 100644 index 0000000000..a0aa67c703 --- /dev/null +++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/iOS/additional_windows_runtime_deps.cmake @@ -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 +) diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/iOS/additional_windows_tool_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/iOS/additional_windows_tool_deps.cmake new file mode 100644 index 0000000000..99eec9a733 --- /dev/null +++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/iOS/additional_windows_tool_deps.cmake @@ -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 +) From 6a3e89202016cc21b0b489fdea2c85fbdd6a28ba Mon Sep 17 00:00:00 2001 From: Aristo7 <5432499+Aristo7@users.noreply.github.com> Date: Wed, 5 May 2021 15:42:57 -0500 Subject: [PATCH 2/7] Fixed up pal file names --- ...s_runtime_deps.cmake => additional_android_runtime_deps.cmake} | 0 ...windows_tool_deps.cmake => additional_android_tool_deps.cmake} | 0 ...ows_runtime_deps.cmake => additional_linux_runtime_deps.cmake} | 0 ...l_windows_tool_deps.cmake => additional_linux_tool_deps.cmake} | 0 ...ndows_runtime_deps.cmake => additional_mac_runtime_deps.cmake} | 0 ...nal_windows_tool_deps.cmake => additional_mac_tool_deps.cmake} | 0 ...ndows_runtime_deps.cmake => additional_ios_runtime_deps.cmake} | 0 ...nal_windows_tool_deps.cmake => additional_ios_tool_deps.cmake} | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Android/{additional_windows_runtime_deps.cmake => additional_android_runtime_deps.cmake} (100%) rename Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Android/{additional_windows_tool_deps.cmake => additional_android_tool_deps.cmake} (100%) rename Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/{additional_windows_runtime_deps.cmake => additional_linux_runtime_deps.cmake} (100%) rename Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/{additional_windows_tool_deps.cmake => additional_linux_tool_deps.cmake} (100%) rename Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/{additional_windows_runtime_deps.cmake => additional_mac_runtime_deps.cmake} (100%) rename Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/{additional_windows_tool_deps.cmake => additional_mac_tool_deps.cmake} (100%) rename Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/iOS/{additional_windows_runtime_deps.cmake => additional_ios_runtime_deps.cmake} (100%) rename Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/iOS/{additional_windows_tool_deps.cmake => additional_ios_tool_deps.cmake} (100%) diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Android/additional_windows_runtime_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Android/additional_android_runtime_deps.cmake similarity index 100% rename from Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Android/additional_windows_runtime_deps.cmake rename to Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Android/additional_android_runtime_deps.cmake diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Android/additional_windows_tool_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Android/additional_android_tool_deps.cmake similarity index 100% rename from Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Android/additional_windows_tool_deps.cmake rename to Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Android/additional_android_tool_deps.cmake diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_windows_runtime_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_linux_runtime_deps.cmake similarity index 100% rename from Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_windows_runtime_deps.cmake rename to Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_linux_runtime_deps.cmake diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_windows_tool_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_linux_tool_deps.cmake similarity index 100% rename from Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_windows_tool_deps.cmake rename to Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_linux_tool_deps.cmake diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_windows_runtime_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_mac_runtime_deps.cmake similarity index 100% rename from Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_windows_runtime_deps.cmake rename to Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_mac_runtime_deps.cmake diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_windows_tool_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_mac_tool_deps.cmake similarity index 100% rename from Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_windows_tool_deps.cmake rename to Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_mac_tool_deps.cmake diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/iOS/additional_windows_runtime_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/iOS/additional_ios_runtime_deps.cmake similarity index 100% rename from Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/iOS/additional_windows_runtime_deps.cmake rename to Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/iOS/additional_ios_runtime_deps.cmake diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/iOS/additional_windows_tool_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/iOS/additional_ios_tool_deps.cmake similarity index 100% rename from Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/iOS/additional_windows_tool_deps.cmake rename to Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/iOS/additional_ios_tool_deps.cmake From 1e232294d564f0fa80190549ee77850807b1b9d1 Mon Sep 17 00:00:00 2001 From: Aristo7 <5432499+Aristo7@users.noreply.github.com> Date: Mon, 10 May 2021 14:36:32 -0500 Subject: [PATCH 3/7] Added Null RHI to all targets --- Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt b/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt index 30861a6feb..33873e0dfa 100644 --- a/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt +++ b/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt @@ -54,6 +54,7 @@ ly_add_target( 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 @@ -89,6 +90,8 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS) 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 From 703f9deee0f01c0d00ff636ee8ce18d2c9a3646c Mon Sep 17 00:00:00 2001 From: Aristo7 <5432499+Aristo7@users.noreply.github.com> Date: Tue, 11 May 2021 12:43:30 -0500 Subject: [PATCH 4/7] Testing jenkins break --- Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt b/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt index 33873e0dfa..06b4e2a7fe 100644 --- a/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt +++ b/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt @@ -104,5 +104,14 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS) Gem::ImguiAtom Gem::AtomFont Gem::AtomToolsFramework.Editor + + # Testing jenkins issue + 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 ) endif() From fe24f37a705738160a657bd22b4fe5c011e0f01e Mon Sep 17 00:00:00 2001 From: Aristo7 <5432499+Aristo7@users.noreply.github.com> Date: Tue, 11 May 2021 15:34:31 -0500 Subject: [PATCH 5/7] Fixing up null.builder loading issue --- Gems/Atom/RHI/Null/Code/CMakeLists.txt | 2 +- Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/Gems/Atom/RHI/Null/Code/CMakeLists.txt b/Gems/Atom/RHI/Null/Code/CMakeLists.txt index 1b88e72648..be1c5d22aa 100644 --- a/Gems/Atom/RHI/Null/Code/CMakeLists.txt +++ b/Gems/Atom/RHI/Null/Code/CMakeLists.txt @@ -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 diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt b/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt index 06b4e2a7fe..33873e0dfa 100644 --- a/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt +++ b/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt @@ -104,14 +104,5 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS) Gem::ImguiAtom Gem::AtomFont Gem::AtomToolsFramework.Editor - - # Testing jenkins issue - 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 ) endif() From b92a1884a806a6df681ec95954a9a4e03688561c Mon Sep 17 00:00:00 2001 From: Aristo7 <5432499+Aristo7@users.noreply.github.com> Date: Tue, 11 May 2021 18:08:59 -0400 Subject: [PATCH 6/7] Addex dx12/metal builders to linux --- .../Code/Source/Platform/Linux/additional_linux_tool_deps.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_linux_tool_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_linux_tool_deps.cmake index 8fb58f5e56..942a694205 100644 --- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_linux_tool_deps.cmake +++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_linux_tool_deps.cmake @@ -12,4 +12,6 @@ set(LY_RUNTIME_DEPENDENCIES Gem::Atom_RHI_Vulkan.Private Gem::Atom_RHI_Vulkan.Builders + Gem::Atom_RHI_DX12.Builders + Gem::Atom_RHI_Metal.Builders ) From 93ef3acb504ca8b978e12b414d09cc5c835c4ac3 Mon Sep 17 00:00:00 2001 From: Aristo7 <5432499+Aristo7@users.noreply.github.com> Date: Tue, 11 May 2021 18:43:09 -0400 Subject: [PATCH 7/7] Removing non-tool modules from tools runtime deps --- .../Source/Platform/Linux/additional_linux_tool_deps.cmake | 1 - .../Code/Source/Platform/Mac/additional_mac_tool_deps.cmake | 3 --- .../Platform/Windows/additional_windows_tool_deps.cmake | 4 ---- 3 files changed, 8 deletions(-) diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_linux_tool_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_linux_tool_deps.cmake index 942a694205..908417b1f8 100644 --- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_linux_tool_deps.cmake +++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Linux/additional_linux_tool_deps.cmake @@ -10,7 +10,6 @@ # set(LY_RUNTIME_DEPENDENCIES - Gem::Atom_RHI_Vulkan.Private Gem::Atom_RHI_Vulkan.Builders Gem::Atom_RHI_DX12.Builders Gem::Atom_RHI_Metal.Builders diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_mac_tool_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_mac_tool_deps.cmake index 0b601adf8d..445a416a68 100644 --- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_mac_tool_deps.cmake +++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Mac/additional_mac_tool_deps.cmake @@ -10,10 +10,7 @@ # set(LY_RUNTIME_DEPENDENCIES - Gem::Atom_RHI_Metal.Private Gem::Atom_RHI_Metal.Builders Gem::Atom_RHI_Vulkan.Builders Gem::Atom_RHI_DX12.Builders - Gem::Atom_RHI_Null.Private - Gem::Atom_RHI_Null.Builders ) diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Windows/additional_windows_tool_deps.cmake b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Windows/additional_windows_tool_deps.cmake index e30a9737ac..908417b1f8 100644 --- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Windows/additional_windows_tool_deps.cmake +++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/Platform/Windows/additional_windows_tool_deps.cmake @@ -10,11 +10,7 @@ # set(LY_RUNTIME_DEPENDENCIES - 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 )