birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LYN-2524: Updates for PR feedback. Simplify path building, fix whitespace.

Browse Source
This commit is contained in:
phistere
2021-04-22 11:42:58 -05:00
parent ace7a64b24
commit 93ba2ea251
4 changed files with 4 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzFramework/Platform/Linux/AzFramework/Asset/AssetSystemComponentHelper_Linux.cpp
+1 -10
View File
@@ -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()))
{
Code/Framework/AzFramework/Platform/Mac/AzFramework/Asset/AssetSystemComponentHelper_Mac.cpp
+1 -10
View File
@@ -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()))
{
Code/Framework/AzFramework/Platform/Windows/AzFramework/Asset/AssetSystemComponentHelper_Windows.cpp
+1 -10
View File
@@ -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()))
{
cmake/Platform/Common/Install_common.cmake
+1 -1
View File
@@ -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(