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

improving the check so it doesnt have to be "FALSE" (and can be 0/Off/etc)

Browse Source
This commit is contained in:
Esteban Papp
2021-06-14 13:46:51 -07:00
committed by pappeste
parent 6e2e187e31
commit 02dd2138cb
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/Platform/Mac/runtime_dependencies_mac.cmake.in
+7 -5
View File
@@ -24,7 +24,7 @@ function(ly_copy source_file target_directory)
# If source_file is a Framework and target_directory is a bundle
if("${source_file}" MATCHES "\\.[Ff]ramework[^\\.]" AND "${target_directory}" MATCHES "\\.app/Contents/MacOS")
if("@LY_BUILD_FIXUP_BUNDLE@" STREQUAL FALSE)
if(NOT @LY_BUILD_FIXUP_BUNDLE@)
return()
endif()
@@ -38,7 +38,7 @@ function(ly_copy source_file target_directory)
elseif("${source_file}" MATCHES "qt/plugins" AND "${target_directory}" MATCHES "\\.app/Contents/MacOS")
if("@LY_BUILD_FIXUP_BUNDLE@" STREQUAL FALSE)
if(NOT @LY_BUILD_FIXUP_BUNDLE@)
return()
endif()
@@ -68,8 +68,10 @@ function(ly_copy source_file target_directory)
if(NOT EXISTS "${target_directory}")
file(MAKE_DIRECTORY "${target_directory}")
endif()
if(NOT EXISTS "${target_directory}/${target_filename}" OR "${source_file}" IS_NEWER_THAN "${target_directory}/${target_filename}")
file(LOCK "${CMAKE_BINARY_DIR}/runtimedependencies.lock" GUARD FUNCTION TIMEOUT 30)
if(IS_DIRECTORY ${source_file})
message(STATUS "Copying \"${source_file}\" to \"${target_directory}\"...")
file(COPY "${source_file}" DESTINATION "${target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN)
elseif(NOT EXISTS "${target_directory}/${target_filename}" OR "${source_file}" IS_NEWER_THAN "${target_directory}/${target_filename}")
message(STATUS "Copying \"${source_file}\" to \"${target_directory}\"...")
file(COPY "${source_file}" DESTINATION "${target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN)
file(TOUCH ${target_directory}/${target_filename})
@@ -80,7 +82,7 @@ endfunction()
@LY_COPY_COMMANDS@
if("@LY_BUILD_FIXUP_BUNDLE@" STREQUAL FALSE)
if(NOT @LY_BUILD_FIXUP_BUNDLE@)
return()
endif()