From 50d6e36ccd17c9214f057e749dc73db5a2c148b8 Mon Sep 17 00:00:00 2001
From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
Date: Fri, 4 Jun 2021 14:36:46 -0700
Subject: [PATCH] Bug and improvements to Editor/AP debugging settings (#1146)

---
 Code/Sandbox/Editor/CMakeLists.txt       |  4 ++--
 Code/Tools/AssetProcessor/CMakeLists.txt |  4 ++--
 cmake/Projects.cmake                     | 12 +++++++++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Code/Sandbox/Editor/CMakeLists.txt b/Code/Sandbox/Editor/CMakeLists.txt
index 01b58e3f77..58d5e86a2f 100644
--- a/Code/Sandbox/Editor/CMakeLists.txt
+++ b/Code/Sandbox/Editor/CMakeLists.txt
@@ -191,8 +191,8 @@ ly_add_translations(
 )
 ly_add_dependencies(Editor AssetProcessor)
 
-if(LY_FIRST_PROJECT_PATH)
-    set_property(TARGET Editor APPEND PROPERTY VS_DEBUGGER_COMMAND_ARGUMENTS "--project-path=\"${LY_FIRST_PROJECT_PATH}\"")
+if(LY_DEFAULT_PROJECT_PATH)
+    set_property(TARGET Editor APPEND PROPERTY VS_DEBUGGER_COMMAND_ARGUMENTS "--project-path=\"${LY_DEFAULT_PROJECT_PATH}\"")
 endif()
 
 ################################################################################
diff --git a/Code/Tools/AssetProcessor/CMakeLists.txt b/Code/Tools/AssetProcessor/CMakeLists.txt
index 6c12ab6024..2db888218b 100644
--- a/Code/Tools/AssetProcessor/CMakeLists.txt
+++ b/Code/Tools/AssetProcessor/CMakeLists.txt
@@ -125,8 +125,8 @@ ly_add_target(
             AZ::AssetProcessorBatch.Static
 )
 
-if(LY_FIRST_PROJECT_PATH)
-    set_property(TARGET AssetProcessor AssetProcessorBatch APPEND PROPERTY VS_DEBUGGER_COMMAND_ARGUMENTS "--project-path=\"${LY_FIRST_PROJECT_PATH}\"")
+if(LY_DEFAULT_PROJECT_PATH)
+    set_property(TARGET AssetProcessor AssetProcessorBatch APPEND PROPERTY VS_DEBUGGER_COMMAND_ARGUMENTS "--project-path=\"${LY_DEFAULT_PROJECT_PATH}\"")
 endif()
 
 # Adds the AssetProcessorBatch target as a C preprocessor define so that it can be used as a Settings Registry
diff --git a/cmake/Projects.cmake b/cmake/Projects.cmake
index adaf7ee15f..eadfa79c1b 100644
--- a/cmake/Projects.cmake
+++ b/cmake/Projects.cmake
@@ -167,9 +167,6 @@ endfunction()
 # Add the projects here so the above function is found
 foreach(project ${LY_PROJECTS})
     file(REAL_PATH ${project} full_directory_path BASE_DIRECTORY ${CMAKE_SOURCE_DIR})
-    if(NOT LY_FIRST_PROJECT)
-        ly_set(LY_FIRST_PROJECT_PATH ${full_directory_path})
-    endif()
     string(SHA256 full_directory_hash ${full_directory_path})
 
     # Truncate the full_directory_hash down to 8 characters to avoid hitting the Windows 260 character path limit
@@ -182,4 +179,13 @@ foreach(project ${LY_PROJECTS})
     ly_generate_project_build_path_setreg(${full_directory_path})
     add_project_json_external_subdirectories(${full_directory_path})
 endforeach()
+
+# If just one project is defined we pass it as a parameter to the applications
+list(LENGTH LY_PROJECTS projects_length)
+if(projects_length EQUAL "1")
+    list(GET LY_PROJECTS 0 project)
+    file(REAL_PATH ${project} full_directory_path BASE_DIRECTORY ${CMAKE_SOURCE_DIR})
+    ly_set(LY_DEFAULT_PROJECT_PATH ${full_directory_path})
+endif()
+
 ly_set(LY_PROJECTS_FOLDER_NAME ${LY_PROJECTS_FOLDER_NAME})