From 93ba2ea25175164b20a2458d258887edaf12b5ea Mon Sep 17 00:00:00 2001
From: phistere <phistere@amazon.com>
Date: Thu, 22 Apr 2021 11:42:58 -0500
Subject: [PATCH] LYN-2524: Updates for PR feedback. Simplify path building,
 fix whitespace.

---
 .../Asset/AssetSystemComponentHelper_Linux.cpp        | 11 +----------
 .../Asset/AssetSystemComponentHelper_Mac.cpp          | 11 +----------
 .../Asset/AssetSystemComponentHelper_Windows.cpp      | 11 +----------
 cmake/Platform/Common/Install_common.cmake            |  2 +-
 4 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/Code/Framework/AzFramework/Platform/Linux/AzFramework/Asset/AssetSystemComponentHelper_Linux.cpp b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Asset/AssetSystemComponentHelper_Linux.cpp
index 4f9aeaf6c3..1ae3945bd6 100644
--- a/Code/Framework/AzFramework/Platform/Linux/AzFramework/Asset/AssetSystemComponentHelper_Linux.cpp
+++ b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Asset/AssetSystemComponentHelper_Linux.cpp
@@ -35,16 +35,7 @@ namespace AzFramework::AssetSystem::Platform
         if (!AZ::IO::SystemFile::Exists(assetProcessorPath.c_str()))
         {
             // Check for existence of one under a "bin" directory, i.e. engineRoot is an SDK structure.
-            assetProcessorPath.Assign(engineRoot);
-            assetProcessorPath /= "bin";
-#if defined(AZ_DEBUG_BUILD)
-            assetProcessorPath /= "debug";
-#elif defined(AZ_PROFILE_BUILD)
-            assetProcessorPath /= "profile";
-#else
-            assetProcessorPath /= "release";
-#endif
-            assetProcessorPath /= "AssetProcessor";
+            assetProcessorPath = AZ::IO::FixedMaxPath{engineRoot} / "bin" / AZ_BUILD_CONFIGURATION_TYPE / "AssetProcessor";
 
             if (!AZ::IO::SystemFile::Exists(assetProcessorPath.c_str()))
             {
diff --git a/Code/Framework/AzFramework/Platform/Mac/AzFramework/Asset/AssetSystemComponentHelper_Mac.cpp b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Asset/AssetSystemComponentHelper_Mac.cpp
index cc31cc9a0c..6f1f860932 100644
--- a/Code/Framework/AzFramework/Platform/Mac/AzFramework/Asset/AssetSystemComponentHelper_Mac.cpp
+++ b/Code/Framework/AzFramework/Platform/Mac/AzFramework/Asset/AssetSystemComponentHelper_Mac.cpp
@@ -34,16 +34,7 @@ namespace AzFramework::AssetSystem::Platform
         if (!AZ::IO::SystemFile::Exists(assetProcessorPath.c_str()))
         {
             // Check for existence of one under a "bin" directory, i.e. engineRoot is an SDK structure.
-            assetProcessorPath.Assign(engineRoot);
-            assetProcessorPath /= "bin";
-            #if defined(AZ_DEBUG_BUILD)
-            assetProcessorPath /= "debug";
-#elif defined(AZ_PROFILE_BUILD)
-            assetProcessorPath /= "profile";
-#else
-            assetProcessorPath /= "release";
-#endif
-            assetProcessorPath /= "AssetProcessor.app";
+            assetProcessorPath = AZ::IO::FixedMaxPath{engineRoot} / "bin" / AZ_BUILD_CONFIGURATION_TYPE / "AssetProcessor.app";
 
             if (!AZ::IO::SystemFile::Exists(assetProcessorPath.c_str()))
             {
diff --git a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Asset/AssetSystemComponentHelper_Windows.cpp b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Asset/AssetSystemComponentHelper_Windows.cpp
index 155a69a691..b716778cf4 100644
--- a/Code/Framework/AzFramework/Platform/Windows/AzFramework/Asset/AssetSystemComponentHelper_Windows.cpp
+++ b/Code/Framework/AzFramework/Platform/Windows/AzFramework/Asset/AssetSystemComponentHelper_Windows.cpp
@@ -71,16 +71,7 @@ namespace AzFramework::AssetSystem::Platform
         if (!AZ::IO::SystemFile::Exists(assetProcessorPath.c_str()))
         {
             // Check for existence of one under a "bin" directory, i.e. engineRoot is an SDK structure.
-            assetProcessorPath.Assign(engineRoot);
-            assetProcessorPath /= "bin";
-#if defined(AZ_DEBUG_BUILD)
-            assetProcessorPath /= "debug";
-#elif defined(AZ_PROFILE_BUILD)
-            assetProcessorPath /= "profile";
-#else
-            assetProcessorPath /= "release";
-#endif
-            assetProcessorPath /= "AssetProcessor.exe";
+            assetProcessorPath = AZ::IO::FixedMaxPath{engineRoot} / "bin" / AZ_BUILD_CONFIGURATION_TYPE / "AssetProcessor.exe";
 
             if (!AZ::IO::SystemFile::Exists(assetProcessorPath.c_str()))
             {
diff --git a/cmake/Platform/Common/Install_common.cmake b/cmake/Platform/Common/Install_common.cmake
index 023b7369a7..105b208338 100644
--- a/cmake/Platform/Common/Install_common.cmake
+++ b/cmake/Platform/Common/Install_common.cmake
@@ -184,7 +184,7 @@ function(ly_setup_cmake_install)
 
     install(DIRECTORY "${CMAKE_SOURCE_DIR}/cmake"
         DESTINATION .
-        REGEX "Findo3de.cmake" EXCLUDE  
+        REGEX "Findo3de.cmake" EXCLUDE
         REGEX "Platform\/.*\/BuiltInPackages_.*\.cmake" EXCLUDE
     )
     install(