This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit e3fcb025cba4fd884d32c86bc04eea2e0623cd21 Author: xuxin19 <[email protected]> AuthorDate: Wed Dec 11 15:25:03 2024 +0800 cmake(bugfix):fix common/etc confilt with src/etc in CMake genromfs We use the rules added later to overwrite the previous rules Signed-off-by: xuxin19 <[email protected]> --- cmake/nuttx_add_romfs.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cmake/nuttx_add_romfs.cmake b/cmake/nuttx_add_romfs.cmake index 6ae2840df88..8124fd3f307 100644 --- a/cmake/nuttx_add_romfs.cmake +++ b/cmake/nuttx_add_romfs.cmake @@ -341,12 +341,18 @@ function(process_all_directory_romfs) DEPENDS ${dyn_deps}) list(APPEND DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX}) else() + list(FIND DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX} index) + if(index GREATER -1) + set(APPEND_OPTION APPEND) + else() + set(APPEND_OPTION) + endif() list(APPEND DEPENDS ${SOURCE_ETC_PREFIX}/${SOURCE_ETC_SUFFIX}) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX} COMMAND ${CMAKE_COMMAND} -E copy ${SOURCE_ETC_PREFIX}/${SOURCE_ETC_SUFFIX} - ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX} + ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX} ${APPEND_OPTION} DEPENDS ${dyn_deps}) list(APPEND DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX}) endif()
