Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-27 11:26:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

cmake(bugfix):fix directory not being successfully added when adding romfs

Browse Source 
board content should overwrite common content

Signed-off-by: xuxin19 <xuxin19@xiaomi.com>
This commit is contained in:
xuxin19
2024-11-08 17:34:10 +08:00
committed by Xiang Xiao
parent d0dec06e6d
commit acb5058428
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/nuttx_add_romfs.cmake
+11 -12
View File
@@ -82,8 +82,8 @@ function(nuttx_add_romfs)
board_rcraws board_rcraws
TARGET board TARGET board
PROPERTY BOARD_RCRAWS) PROPERTY BOARD_RCRAWS)
list(APPEND RCSRCS ${board_rcsrcs}) list(PREPEND RCSRCS ${board_rcsrcs})
list(APPEND RCRAWS ${board_rcraws}) list(PREPEND RCRAWS ${board_rcraws})
endif() endif()
foreach(rcsrc ${RCSRCS}) foreach(rcsrc ${RCSRCS})
@@ -120,16 +120,15 @@ function(nuttx_add_romfs)
endif() endif()
if(IS_DIRECTORY ${SOURCE_ETC_PREFIX}/${SOURCE_ETC_SUFFIX}) if(IS_DIRECTORY ${SOURCE_ETC_PREFIX}/${SOURCE_ETC_SUFFIX})
file( add_custom_command(
GLOB subraws OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX}
LIST_DIRECTORIES false COMMAND ${CMAKE_COMMAND} -E make_directory
RELATIVE ${SOURCE_ETC_PREFIX} ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX}
${SOURCE_ETC_PREFIX}/${SOURCE_ETC_SUFFIX}) COMMAND
foreach(subraw ${subraws}) ${CMAKE_COMMAND} -E copy_directory
list(APPEND DEPENDS ${SOURCE_ETC_PREFIX}/${subraw}) ${SOURCE_ETC_PREFIX}/${SOURCE_ETC_SUFFIX}
configure_file(${SOURCE_ETC_PREFIX}/${subraw} ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX})
${CMAKE_CURRENT_BINARY_DIR}/${subraw} COPYONLY) list(APPEND DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ETC_SUFFIX})
endforeach()
else() else()
list(APPEND DEPENDS ${SOURCE_ETC_PREFIX}/${SOURCE_ETC_SUFFIX}) list(APPEND DEPENDS ${SOURCE_ETC_PREFIX}/${SOURCE_ETC_SUFFIX})
configure_file(${SOURCE_ETC_PREFIX}/${SOURCE_ETC_SUFFIX} configure_file(${SOURCE_ETC_PREFIX}/${SOURCE_ETC_SUFFIX}