From a9e59fd75f6a0ce20854d648273568ab853890b5 Mon Sep 17 00:00:00 2001
From: lumberyard-employee-dm
 <56135373+lumberyard-employee-dm@users.noreply.github.com>
Date: Wed, 9 Jun 2021 18:50:47 -0500
Subject: [PATCH] Updating the DefaultProject template to not insert the
 project-path parameter  (#1223)

* Updating the DefaultProject template to not insert the project-path parameter into the VS Debugger Arguments for any applications

Added project-path injection directly within the LauncherUnified and AssetBuilder cmake scripts where their targets are defined

* Removing the add_vs_debugger_arguments call from the AutomatedTesting CMakeLists.txt
---
 AutomatedTesting/CMakeLists.txt                     | 13 -------------
 Code/LauncherUnified/launcher_generator.cmake       |  8 ++++++++
 .../AssetProcessor/AssetBuilder/CMakeLists.txt      |  4 ++++
 Templates/DefaultProject/Template/CMakeLists.txt    | 13 -------------
 4 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/AutomatedTesting/CMakeLists.txt b/AutomatedTesting/CMakeLists.txt
index 289d0a6565..e239ba7674 100644
--- a/AutomatedTesting/CMakeLists.txt
+++ b/AutomatedTesting/CMakeLists.txt
@@ -9,18 +9,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
 
-#! Adds the --project-path argument to the VS IDE debugger command arguments
-function(add_vs_debugger_arguments)
-    # Inject the project root into the --project-path argument into the Visual Studio Debugger arguments by defaults
-    list(APPEND app_targets AutomatedTesting.GameLauncher AutomatedTesting.ServerLauncher)
-    list(APPEND app_targets AssetBuilder AssetProcessor AssetProcessorBatch Editor)
-    foreach(app_target IN LISTS app_targets)
-        if (TARGET ${app_target})
-            set_property(TARGET ${app_target} APPEND PROPERTY VS_DEBUGGER_COMMAND_ARGUMENTS "--project-path=\"${CMAKE_CURRENT_LIST_DIR}\"")
-        endif()
-    endforeach()
-endfunction()
-
 if(NOT PROJECT_NAME)
     cmake_minimum_required(VERSION 3.19)
     project(AutomatedTesting
@@ -30,7 +18,6 @@ if(NOT PROJECT_NAME)
     include(EngineFinder.cmake OPTIONAL)
     find_package(o3de REQUIRED)
     o3de_initialize()
-    add_vs_debugger_arguments()
 else()
     # Add the project_name to global LY_PROJECTS_TARGET_NAME property
     file(READ "${CMAKE_CURRENT_LIST_DIR}/project.json" project_json)
diff --git a/Code/LauncherUnified/launcher_generator.cmake b/Code/LauncherUnified/launcher_generator.cmake
index 2f4c8a8b74..36cd3c5899 100644
--- a/Code/LauncherUnified/launcher_generator.cmake
+++ b/Code/LauncherUnified/launcher_generator.cmake
@@ -126,6 +126,10 @@ foreach(project_name project_path IN ZIP_LISTS LY_PROJECTS_TARGET_NAME LY_PROJEC
             FOLDER ${project_name}
     )
 
+    if(LY_DEFAULT_PROJECT_PATH)
+        set_property(TARGET ${project_name}.GameLauncher APPEND PROPERTY VS_DEBUGGER_COMMAND_ARGUMENTS "--project-path=\"${LY_DEFAULT_PROJECT_PATH}\"")
+    endif()
+
     ################################################################################
     # Server
     ################################################################################
@@ -166,6 +170,10 @@ foreach(project_name project_path IN ZIP_LISTS LY_PROJECTS_TARGET_NAME LY_PROJEC
                 PROPERTIES 
                     FOLDER ${project_name}
             )
+
+            if(LY_DEFAULT_PROJECT_PATH)
+                set_property(TARGET ${project_name}.ServerLauncher APPEND PROPERTY VS_DEBUGGER_COMMAND_ARGUMENTS "--project-path=\"${LY_DEFAULT_PROJECT_PATH}\"")
+            endif()
         endif()
 
     endif()
diff --git a/Code/Tools/AssetProcessor/AssetBuilder/CMakeLists.txt b/Code/Tools/AssetProcessor/AssetBuilder/CMakeLists.txt
index 9aa81208f6..89c2554acb 100644
--- a/Code/Tools/AssetProcessor/AssetBuilder/CMakeLists.txt
+++ b/Code/Tools/AssetProcessor/AssetBuilder/CMakeLists.txt
@@ -28,6 +28,10 @@ ly_add_target(
             AZ::AzToolsFramework
 )
 
+if(LY_DEFAULT_PROJECT_PATH)
+    set_property(TARGET AssetBuilder APPEND PROPERTY VS_DEBUGGER_COMMAND_ARGUMENTS "--project-path=\"${LY_DEFAULT_PROJECT_PATH}\"")
+endif()
+
 # Aggregates all combined AssetBuilders into a single LY_ASSET_BUILDERS #define
 get_property(asset_builders GLOBAL PROPERTY LY_ASSET_BUILDERS)
 string (REPLACE ";" "," asset_builders "${asset_builders}")
diff --git a/Templates/DefaultProject/Template/CMakeLists.txt b/Templates/DefaultProject/Template/CMakeLists.txt
index b5b8692059..50e3a528e6 100644
--- a/Templates/DefaultProject/Template/CMakeLists.txt
+++ b/Templates/DefaultProject/Template/CMakeLists.txt
@@ -11,18 +11,6 @@
 #
 # {END_LICENSE}
 
-#! Adds the --project-path argument to the VS IDE debugger command arguments
-function(add_vs_debugger_arguments)
-    # Inject the project root into the --project-path argument into the Visual Studio Debugger arguments by defaults
-    list(APPEND app_targets ${Name}.GameLauncher ${Name}.ServerLauncher)
-    list(APPEND app_targets AssetBuilder AssetProcessor AssetProcessorBatch Editor)
-    foreach(app_target IN LISTS app_targets)
-        if (TARGET ${app_target})
-            set_property(TARGET ${app_target} APPEND PROPERTY VS_DEBUGGER_COMMAND_ARGUMENTS "--project-path=\"${CMAKE_CURRENT_LIST_DIR}\"")
-        endif()
-    endforeach()
-endfunction()
-
 if(NOT PROJECT_NAME)
     cmake_minimum_required(VERSION 3.19)
     project(${Name}
@@ -32,7 +20,6 @@ if(NOT PROJECT_NAME)
     include(EngineFinder.cmake OPTIONAL)
     find_package(o3de REQUIRED)
     o3de_initialize()
-    add_vs_debugger_arguments()
 else()
     # Add the project_name to global LY_PROJECTS_TARGET_NAME property
     file(READ "${CMAKE_CURRENT_LIST_DIR}/project.json" project_json)