[CMAKE]

- 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

diff --git a/reactos/boot/CMakeLists.txt b/reactos/boot/CMakeLists.txt
index e9aaf9b..9b5c288 100644 (file)
--- a/reactos/boot/CMakeLists.txt
+++ b/reactos/boot/CMakeLists.txt
@@ -17,7 +17,7 @@ endif()
 
 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
-    DEPENDS native-fatten fat bootmgfw bcd_hive
+    DEPENDS native-fatten fat bootmgfw
     VERBATIM)
 
 

diff --git a/reactos/sdk/cmake/CMakeMacros.cmake b/reactos/sdk/cmake/CMakeMacros.cmake
index 243cebf..8af76ea 100644 (file)
--- a/reactos/sdk/cmake/CMakeMacros.cmake
+++ b/reactos/sdk/cmake/CMakeMacros.cmake
@@ -774,6 +774,7 @@ function(create_registry_hives)
             ${CMAKE_BINARY_DIR}/boot/bootdata/security
             ${CMAKE_BINARY_DIR}/boot/bootdata/software
             ${CMAKE_BINARY_DIR}/boot/bootdata/system
+            ${CMAKE_BINARY_DIR}/boot/bootdata/BCD
         COMMAND native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata ${_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/security
             ${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(
         FILE ${CMAKE_BINARY_DIR}/boot/bootdata/sam
@@ -794,18 +796,9 @@ function(create_registry_hives)
         DESTINATION reactos/system32/config
         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(
         FILE ${CMAKE_BINARY_DIR}/boot/bootdata/BCD
-        TARGET bcd_hive
+        TARGET livecd_hives
         DESTINATION efi/boot
         NO_CAB
         FOR bootcd regtest livecd)