[ros-diffs] [reactos] 04/10: [CMAKE] Use consolidated registry.inf for generating SETUPREG.HIV This way all registry data generated by add_registry_inf goes there. SETUPREG.HIV increased by about 12KiB after that

[Victor Perevertkin]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=edb425d89e097950d7e69…

commit edb425d89e097950d7e69189f0fdcefb1f8ec598
Author:     Victor Perevertkin <victor.perevertkin(a)reactos.org>
AuthorDate: Fri Nov 20 17:16:08 2020 +0300
Commit:     Victor Perevertkin <victor.perevertkin(a)reactos.org>
CommitDate: Mon Jan 4 16:50:32 2021 +0300

    [CMAKE] Use consolidated registry.inf for generating SETUPREG.HIV
    This way all registry data generated by add_registry_inf goes there.
    SETUPREG.HIV increased by about 12KiB after that
---
 sdk/cmake/CMakeMacros.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake
index 6c72d553c22..62191f30913 100644
--- a/sdk/cmake/CMakeMacros.cmake
+++ b/sdk/cmake/CMakeMacros.cmake
@@ -765,8 +765,8 @@ function(create_registry_hives)
     # BootCD setup system hive
     add_custom_command(
         OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/SETUPREG.HIV
-        COMMAND native-mkhive -h:SETUPREG -u -d:${CMAKE_BINARY_DIR}/boot/bootdata
${CMAKE_BINARY_DIR}/boot/bootdata/hivesys_utf16.inf
${CMAKE_SOURCE_DIR}/boot/bootdata/setupreg.inf
-        DEPENDS native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata/hivesys_utf16.inf)
+        COMMAND native-mkhive -h:SETUPREG -u -d:${CMAKE_BINARY_DIR}/boot/bootdata
${_registry_inf} ${CMAKE_SOURCE_DIR}/boot/bootdata/setupreg.inf
+        DEPENDS native-mkhive ${_registry_inf})
 
     add_custom_target(bootcd_hives
         DEPENDS ${CMAKE_BINARY_DIR}/boot/bootdata/SETUPREG.HIV)