From eefa8d3de83269f153fb8fdf7bffbaad4563fb87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=9F=E6=88=98?= <40414978+PatriceJiang@users.noreply.github.com> Date: Mon, 22 Nov 2021 10:53:57 +0800 Subject: [PATCH] skip Xcode update (#4058) --- native/templates/ios/CMakeLists.txt | 13 ++++++++++--- native/templates/mac/CMakeLists.txt | 11 ++++++++++- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/native/templates/ios/CMakeLists.txt b/native/templates/ios/CMakeLists.txt index 616b9f5c64..7b87574163 100755 --- a/native/templates/ios/CMakeLists.txt +++ b/native/templates/ios/CMakeLists.txt @@ -36,8 +36,9 @@ list(APPEND PROJ_SOURCES ${CMAKE_CURRENT_LIST_DIR}/ViewController.h ${UI_RESOURCES} ) - -include_resources(${RES_DIR}/assets) +if(NOT CUSTOM_COPY_RESOURCE_HOOK) + include_resources(${RES_DIR}/assets) +endif() add_executable(${LIB_NAME} ${PROJ_SOURCES} ${ASSET_FILES} ${PROJ_COMMON_SOURCES}) source_group(TREE ${RES_DIR}/assets PREFIX "Resources" FILES ${ASSET_FILES}) @@ -69,4 +70,10 @@ set_target_properties(${LIB_NAME} PROPERTIES IOS_INSTALL_COMBINED YES XCODE_ATTRIBUTE_SKIP_INSTALL NO XCODE_ATTRIBUTE_INSTALL_PATH "$(LOCAL_APPS_DIR)" -) \ No newline at end of file +) + +if(CUSTOM_COPY_RESOURCE_HOOK) +add_custom_command(TARGET ${LIB_NAME} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory ${RES_DIR}/assets $ + ) +endif() diff --git a/native/templates/mac/CMakeLists.txt b/native/templates/mac/CMakeLists.txt index 31307819be..689bb03187 100644 --- a/native/templates/mac/CMakeLists.txt +++ b/native/templates/mac/CMakeLists.txt @@ -34,7 +34,9 @@ list(APPEND PROJ_SOURCES ${UI_RESOURCES} ) -include_resources(${RES_DIR}/assets) +if(NOT CUSTOM_COPY_RESOURCE_HOOK) + include_resources(${RES_DIR}/assets) +endif() add_executable(${LIB_NAME} ${PROJ_SOURCES} ${ASSET_FILES} ${PROJ_COMMON_SOURCES}) source_group(TREE ${RES_DIR}/assets PREFIX "Resources" FILES ${ASSET_FILES}) @@ -69,6 +71,13 @@ if(ENABLE_SANDBOX) ) endif() +if(CUSTOM_COPY_RESOURCE_HOOK) +add_custom_command(TARGET ${LIB_NAME} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E make_directory $/../Resources + COMMAND ${CMAKE_COMMAND} -E copy_directory ${RES_DIR}/assets $/../Resources +) +endif() + get_property(gles2_loc TARGET GLESv2 PROPERTY IMPORTED_LOCATION) get_property(egl_loc TARGET EGL PROPERTY IMPORTED_LOCATION) add_custom_command(TARGET ${LIB_NAME} POST_BUILD