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

fix edge case with deprecated pal functions (#6976)

Browse Source 
* fix edge case with deprecated pal functions

Signed-off-by: byrcolin <byrcolin@amazon.com>
This commit is contained in:
AMZN-byrcolin
2022-01-18 12:12:55 -08:00
committed by GitHub
parent 4af918a4a8
commit d9e636f77e
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/PAL.cmake
+24 -12
View File
@@ -298,21 +298,27 @@ function(ly_get_absolute_pal_filename out_name in_name)
# parent relative path is optional
if(${ARGC} GREATER 4)
set(parent_relative_path ${ARGV4})
if(ARGV4)
set(parent_relative_path ${ARGV4})
endif()
endif()
# The Default object path for path is the LY_ROOT_FOLDER
cmake_path(SET object_path NORMALIZE "${LY_ROOT_FOLDER}")
if(${ARGC} GREATER 3)
# The user has supplied an object restricted path, the object path for consideration
cmake_path(SET object_path NORMALIZE ${ARGV3})
if(ARGV3)
# The user has supplied an object restricted path, the object path for consideration
cmake_path(SET object_path NORMALIZE ${ARGV3})
endif()
endif()
# The default restricted object path is O3DE_ENGINE_RESTRICTED_PATH
cmake_path(SET object_restricted_path NORMALIZE "${O3DE_ENGINE_RESTRICTED_PATH}")
if(${ARGC} GREATER 2)
# The user has supplied an object restricted path
cmake_path(SET object_restricted_path NORMALIZE ${ARGV2})
if(ARGV3)
# The user has supplied an object restricted path
cmake_path(SET object_restricted_path NORMALIZE ${ARGV2})
endif()
endif()
if(${ARGC} GREATER 4)
@@ -394,27 +400,33 @@ function(ly_get_list_relative_pal_filename out_name in_name)
# parent relative path is optional
if(${ARGC} GREATER 4)
set(parent_relative_path ${ARGV4})
if(ARGV4)
set(parent_relative_path ${ARGV4})
endif()
endif()
# The Default object path for path is the LY_ROOT_FOLDER
cmake_path(SET object_path NORMALIZE "${LY_ROOT_FOLDER}")
if(${ARGC} GREATER 3)
# The user has supplied an object restricted path, the object path for consideration
cmake_path(SET object_path NORMALIZE ${ARGV3})
if(ARGV3)
# The user has supplied an object restricted path, the object path for consideration
cmake_path(SET object_path NORMALIZE ${ARGV3})
endif()
endif()
# The default restricted object path is O3DE_ENGINE_RESTRICTED_PATH
cmake_path(SET object_restricted_path NORMALIZE "${O3DE_ENGINE_RESTRICTED_PATH}")
if(${ARGC} GREATER 2)
# The user has supplied an object restricted path
cmake_path(SET object_restricted_path NORMALIZE ${ARGV2})
if(ARGV2)
# The user has supplied an object restricted path
cmake_path(SET object_restricted_path NORMALIZE ${ARGV2})
endif()
endif()
if(${ARGC} GREATER 4)
o3de_pal_dir(abs_name ${in_name} ${object_restricted_path} ${object_path} ${parent_relative_path})
o3de_pal_dir(abs_name ${in_name} "${object_restricted_path}" "${object_path}" "${parent_relative_path}")
else()
o3de_pal_dir(abs_name ${in_name} ${object_restricted_path} ${object_path})
o3de_pal_dir(abs_name ${in_name} "${object_restricted_path}" "${object_path}")
endif()
cmake_path(RELATIVE_PATH abs_name BASE_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} OUTPUT_VARIABLE relative_name)