mirrors/reactos
0
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-29 14:33:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

[CMAKE]

Browse Source 
- Only call mkhive once, as it always generates all 6 binary hives (and if you don't give it all inf files, some of the hives will end up empty).
- Remove no longer needed dependency of efisys on bcd_hive
CORE-13241

svn path=/trunk/; revision=74537
This commit is contained in:
Thomas Faber 2017-05-13 19:54:51 +00:00
parent 29d82352a3
commit 4185903012
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reactos/boot/CMakeLists.txt
View File

@ -17,7 +17,7 @@ endif()
add_custom_target(efisys add_custom_target(efisys
COMMAND native-fatten ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin -format 2880 EFIBOOT -boot ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/fat.bin -mkdir EFI -mkdir EFI/BOOT -add $<TARGET_FILE:bootmgfw> EFI/BOOT/boot${EFI_PLATFORM_ID}.efi COMMAND native-fatten ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin -format 2880 EFIBOOT -boot ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/fat.bin -mkdir EFI -mkdir EFI/BOOT -add $<TARGET_FILE:bootmgfw> EFI/BOOT/boot${EFI_PLATFORM_ID}.efi
DEPENDS native-fatten fat bootmgfw bcd_hive DEPENDS native-fatten fat bootmgfw
VERBATIM) VERBATIM)

15
reactos/sdk/cmake/CMakeMacros.cmake
View File

@ -774,6 +774,7 @@ function(create_registry_hives)
${CMAKE_BINARY_DIR}/boot/bootdata/security ${CMAKE_BINARY_DIR}/boot/bootdata/security
${CMAKE_BINARY_DIR}/boot/bootdata/software ${CMAKE_BINARY_DIR}/boot/bootdata/software
${CMAKE_BINARY_DIR}/boot/bootdata/system ${CMAKE_BINARY_DIR}/boot/bootdata/system
${CMAKE_BINARY_DIR}/boot/bootdata/BCD
COMMAND native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata ${_livecd_inf_files} COMMAND native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata ${_livecd_inf_files}
DEPENDS native-mkhive ${_livecd_inf_files}) DEPENDS native-mkhive ${_livecd_inf_files})
@ -782,7 +783,8 @@ function(create_registry_hives)
${CMAKE_BINARY_DIR}/boot/bootdata/default ${CMAKE_BINARY_DIR}/boot/bootdata/default
${CMAKE_BINARY_DIR}/boot/bootdata/security ${CMAKE_BINARY_DIR}/boot/bootdata/security
${CMAKE_BINARY_DIR}/boot/bootdata/software ${CMAKE_BINARY_DIR}/boot/bootdata/software
${CMAKE_BINARY_DIR}/boot/bootdata/system) ${CMAKE_BINARY_DIR}/boot/bootdata/system
${CMAKE_BINARY_DIR}/boot/bootdata/BCD)
add_cd_file( add_cd_file(
FILE ${CMAKE_BINARY_DIR}/boot/bootdata/sam FILE ${CMAKE_BINARY_DIR}/boot/bootdata/sam
@ -794,18 +796,9 @@ function(create_registry_hives)
DESTINATION reactos/system32/config DESTINATION reactos/system32/config
FOR livecd) FOR livecd)
# BCD Hive
add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/BCD
COMMAND native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata ${CMAKE_BINARY_DIR}/boot/bootdata/hivebcd_utf16.inf
DEPENDS native-mkhive ${CMAKE_SOURCE_DIR}/boot/bootdata/hivebcd.inf)
add_custom_target(bcd_hive
DEPENDS ${CMAKE_BINARY_DIR}/boot/bootdata/BCD)
add_cd_file( add_cd_file(
FILE ${CMAKE_BINARY_DIR}/boot/bootdata/BCD FILE ${CMAKE_BINARY_DIR}/boot/bootdata/BCD
TARGET bcd_hive TARGET livecd_hives
DESTINATION efi/boot DESTINATION efi/boot
NO_CAB NO_CAB
FOR bootcd regtest livecd) FOR bootcd regtest livecd)