removing ly_add_target_dependencies

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-09-22 01:38:12 -05:00
parent 7db46da755
commit 7910803e82
8 changed files with 24 additions and 28 deletions
@@ -93,12 +93,14 @@ ly_add_target(
    AUTOMOC
    FILES_CMAKE
        materialeditor_files.cmake
-        Source/Platform/${PAL_PLATFORM_NAME}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
+        ${pal_source_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
+    PLATFORM_INCLUDE_FILES
+        ${pal_source_dir}/tool_dependencies_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
    INCLUDE_DIRECTORIES
        PRIVATE
            .
            Source
-            Source/Platform/${PAL_PLATFORM_NAME}
+            ${pal_source_dir}
        PUBLIC
            Include
    BUILD_DEPENDENCIES
@@ -124,13 +126,6 @@ ly_create_alias(NAME MaterialEditor.Builders NAMESPACE Gem)
 # Editor opens up the MaterialEditor
 ly_add_dependencies(Editor Gem::MaterialEditor)

-ly_add_target_dependencies(
-    TARGETS
-        MaterialEditor
-    DEPENDENCIES_FILES
-        Source/Platform/${PAL_PLATFORM_NAME}/tool_dependencies_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
-)
-
 # Inject the project path into the MaterialEditor VS debugger command arguments if the build system being invoked
 # in a project centric view
 if(NOT PROJECT_NAME STREQUAL "O3DE")
@@ -6,5 +6,5 @@
 #
 #

-set(GEM_DEPENDENCIES
+set(LY_RUNTIME_DEPENDENCIES
 )
@@ -6,5 +6,5 @@
 #
 #

-set(GEM_DEPENDENCIES
+set(LY_RUNTIME_DEPENDENCIES
 )
@@ -6,6 +6,6 @@
 #
 #

-set(GEM_DEPENDENCIES
+set(LY_RUNTIME_DEPENDENCIES
    Gem::QtForPython.Editor
 )
@@ -43,6 +43,7 @@ ly_add_target(
    NAMESPACE Gem
    AUTOMOC
    AUTOUIC
+    AUTORCC
    FILES_CMAKE
        shadermanagementconsolewindow_files.cmake
    INCLUDE_DIRECTORIES
@@ -64,6 +65,8 @@ ly_add_target(
    FILES_CMAKE
        shadermanagementconsole_files.cmake
        ${pal_source_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
+    PLATFORM_INCLUDE_FILES
+        ${pal_source_dir}/tool_dependencies_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
    INCLUDE_DIRECTORIES
        PRIVATE
            .
@@ -88,13 +91,6 @@ ly_set_gem_variant_to_load(TARGETS ShaderManagementConsole VARIANTS Tools)
 # Editor opens up the ShaderManagementConsole
 ly_add_dependencies(Editor Gem::ShaderManagementConsole)

-ly_add_target_dependencies(
-    TARGETS
-        ShaderManagementConsole
-    DEPENDENCIES_FILES
-        Source/Platform/${PAL_PLATFORM_NAME}/tool_dependencies_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
-)
-
 # Inject the project path into the ShaderManagementConsole VS debugger command arguments if the build system being invoked
 # in a project centric view
 if(NOT PROJECT_NAME STREQUAL "O3DE")
@@ -104,9 +100,14 @@ endif()
 # Adds the ShaderManagementConsole target as a C preprocessor define so that it can be used as a Settings Registry
 # specialization in order to look up the generated .setreg which contains the dependencies
 # specified for the target.
-set_source_files_properties(
-    Source/ShaderManagementConsoleApplication.cpp
-    PROPERTIES
-        COMPILE_DEFINITIONS
-            LY_CMAKE_TARGET="ShaderManagementConsole"
-)
+if(TARGET ShaderManagementConsole)
+    set_source_files_properties(
+        Source/ShaderManagementConsoleApplication.cpp
+        PROPERTIES
+            COMPILE_DEFINITIONS
+                LY_CMAKE_TARGET="ShaderManagementConsole"
+    )
+else()
+    message(FATAL_ERROR "Cannot set LY_CMAKE_TARGET define to ShaderManagementConsole as the target doesn't exist anymore."
+        " Perhaps it has been renamed")
+endif()
@@ -6,5 +6,5 @@
 #
 #

-set(GEM_DEPENDENCIES
+set(LY_RUNTIME_DEPENDENCIES
 )
@@ -6,5 +6,5 @@
 #
 #

-set(GEM_DEPENDENCIES
+set(LY_RUNTIME_DEPENDENCIES
 )
@@ -6,6 +6,6 @@
 #
 #

-set(GEM_DEPENDENCIES
+set(LY_RUNTIME_DEPENDENCIES
    Gem::QtForPython.Editor
 )