https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f4e37f936347fef84ff2df4599892bc5ad14402d
commit f4e37f936347fef84ff2df4599892bc5ad14402d Author: Victor Perevertkin <[email protected]> AuthorDate: Fri May 1 02:39:59 2020 +0300 Commit: Victor Perevertkin <[email protected]> CommitDate: Fri May 1 02:39:59 2020 +0300 [CMAKE] Support file lists in add_cd_file for all cases Addendum to 6b48d54 --- sdk/cmake/CMakeMacros.cmake | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 9107de4645d..1f3043667f0 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -363,15 +363,19 @@ function(add_cd_file) add_dependencies(bootcd ${_CD_TARGET} registry_inf) endif() else() - # add it in reactos.cab dir_to_num(${_CD_DESTINATION} _num) - file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.cmake "\"${_CD_FILE}\" ${_num}\n") + foreach(item ${_CD_FILE}) + # add it in reactos.cab + file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.cmake "\"${item}\" ${_num}\n") + + # manage dependency - file level + set_property(GLOBAL APPEND PROPERTY REACTOS_CAB_DEPENDS ${item}) + endforeach() + # manage dependency - target level if(_CD_TARGET) add_dependencies(reactos_cab_inf ${_CD_TARGET}) endif() - # manage dependency - file level - set_property(GLOBAL APPEND PROPERTY REACTOS_CAB_DEPENDS ${_CD_FILE}) endif() endif() #end bootcd
