mirror of
https://github.com/reactos/reactos.git
synced 2024-06-10 14:35:31 +00:00
[0.4.14][CMAKE][BOOTDATA] Fix LiveCD does not import caroots.inf into registry CORE-17739 CORE-17735 (#3930)
It regressed by 0.4.9-dev-82-g6158207c31
fix picked from 0.4.15-dev-3082-g2268b33e18
)
This commit is contained in:
parent
08352ec1be
commit
3c1d046fde
|
@ -9,7 +9,7 @@ add_custom_target(converted_caroots_inf DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/caro
|
|||
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/caroots.inf
|
||||
COMMAND native-utf16le "${CMAKE_CURRENT_SOURCE_DIR}/caroots.inf" "${CMAKE_CURRENT_BINARY_DIR}/caroots.inf"
|
||||
DEPENDS native-utf16le ${CMAKE_CURRENT_SOURCE_DIR}/caroots.inf)
|
||||
add_cd_file(TARGET converted_caroots_inf FILE ${CMAKE_CURRENT_BINARY_DIR}/caroots.inf DESTINATION reactos NO_CAB FOR all)
|
||||
add_cd_file(TARGET converted_caroots_inf FILE ${CMAKE_CURRENT_BINARY_DIR}/caroots.inf DESTINATION reactos NO_CAB FOR bootcd regtest)
|
||||
|
||||
add_registry_inf(
|
||||
hivecls.inf
|
||||
|
|
|
@ -855,7 +855,8 @@ function(create_registry_hives)
|
|||
# LiveCD hives
|
||||
list(APPEND _livecd_inf_files
|
||||
${_registry_inf}
|
||||
${CMAKE_SOURCE_DIR}/boot/bootdata/livecd.inf)
|
||||
${CMAKE_SOURCE_DIR}/boot/bootdata/livecd.inf
|
||||
${CMAKE_SOURCE_DIR}/boot/bootdata/caroots.inf)
|
||||
if(SARCH STREQUAL "xbox")
|
||||
list(APPEND _livecd_inf_files
|
||||
${CMAKE_SOURCE_DIR}/boot/bootdata/hiveinst_xbox.inf)
|
||||
|
|
Loading…
Reference in a new issue