From 091c467d2bfc5eee96ca0875a26d39b0c96f99f4 Mon Sep 17 00:00:00 2001 From: lisyarus Date: Sun, 26 Jul 2026 20:44:26 +0300 Subject: [PATCH] Unified psemek_package_resources implementation across platforms (always behaves like glob_recurse) --- package/CMakeLists.txt | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/package/CMakeLists.txt b/package/CMakeLists.txt index f7f654fc..20a1fdd9 100644 --- a/package/CMakeLists.txt +++ b/package/CMakeLists.txt @@ -213,21 +213,22 @@ endfunction() function(psemek_package_files_impl target as_resources) if(PSEMEK_PACKAGE_MODE) if(PSEMEK_PACKAGE_TARGET) + set(_FILES) + foreach(_PATTERN IN LISTS ARGN) + if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/${_PATTERN}") + list(APPEND _FILES "${_PATTERN}") + else() + file(GLOB_RECURSE _TEMP_FILES RELATIVE "${CMAKE_CURRENT_LIST_DIR}" "${_PATTERN}") + list(APPEND _FILES ${_TEMP_FILES}) + endif() + endforeach() + if(PSEMEK_PLATFORM_ANDROID AND as_resources) add_custom_command(TARGET ${target} POST_BUILD WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} - COMMAND ${PSEMEK_COPY_FILES} ${ARGN} + COMMAND ${PSEMEK_COPY_FILES} ${_FILES} ) elseif(PSEMEK_PLATFORM_WEB AND as_resources) - set(_FILES) - foreach(_PATTERN IN LISTS ARGN) - if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/${_PATTERN}") - list(APPEND _FILES "${_PATTERN}") - else() - file(GLOB_RECURSE _TEMP_FILES RELATIVE "${CMAKE_CURRENT_LIST_DIR}" "${_PATTERN}") - list(APPEND _FILES ${_TEMP_FILES}) - endif() - endforeach() foreach(_FILE IN LISTS _FILES) message(STATUS "Preloading ${CMAKE_CURRENT_LIST_DIR}/${_FILE} as resources/${_FILE}") target_link_options(${target} PRIVATE @@ -239,7 +240,7 @@ function(psemek_package_files_impl target as_resources) add_custom_command(TARGET ${target} POST_BUILD WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} - COMMAND zip -v "${_OUTPUT_PATH}" -r ${ARGN} + COMMAND zip -v "${_OUTPUT_PATH}" -r ${_FILES} ) endif() endif()