[ros-diffs] [hbelusca] 74749: [CMAKE]: Make the mkhive commands actually depend on the generated UTF16 INF files since the latter are those actually used as input to mkhive. Otherwise, the mkhive calls & the U...

Author: hbelusca
Date: Fri Jun  2 16:22:45 2017
New Revision: 74749

URL: http://svn.reactos.org/svn/reactos?rev=74749&view=rev
Log:
[CMAKE]: Make the mkhive commands actually depend on the generated UTF16 INF files since
the latter are those actually used as input to mkhive. Otherwise, the mkhive calls &
the UTF16 INF file conversion is not serialized and we can generate "corrupted"
hives due to the fact that mkhive is using INF files that are in the process of being (and
therefore, only partially) generated.

Modified:
    branches/setup_improvements/sdk/cmake/CMakeMacros.cmake

Modified: branches/setup_improvements/sdk/cmake/CMakeMacros.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/sdk/cmake/CM…
==============================================================================
--- branches/setup_improvements/sdk/cmake/CMakeMacros.cmake	[iso-8859-1] (original)
+++ branches/setup_improvements/sdk/cmake/CMakeMacros.cmake	[iso-8859-1] Fri Jun  2
16:22:45 2017
@@ -766,7 +766,7 @@
     add_custom_command(
         OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/SETUPREG.HIV
         COMMAND native-mkhive -h:SETUPREG -d:${CMAKE_BINARY_DIR}/boot/bootdata
${CMAKE_BINARY_DIR}/boot/bootdata/hivesys_utf16.inf
-        DEPENDS native-mkhive ${CMAKE_SOURCE_DIR}/boot/bootdata/hivesys.inf)
+        DEPENDS native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata/hivesys_utf16.inf)
 
     add_custom_target(bootcd_hives
         DEPENDS ${CMAKE_BINARY_DIR}/boot/bootdata/SETUPREG.HIV)
@@ -814,7 +814,7 @@
     add_custom_command(
         OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/BCD
         COMMAND native-mkhive -h:BCD -d:${CMAKE_BINARY_DIR}/boot/bootdata
${CMAKE_BINARY_DIR}/boot/bootdata/hivebcd_utf16.inf
-        DEPENDS native-mkhive ${CMAKE_SOURCE_DIR}/boot/bootdata/hivebcd.inf)
+        DEPENDS native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata/hivebcd_utf16.inf)
 
     add_custom_target(bcd_hive
         DEPENDS ${CMAKE_BINARY_DIR}/boot/bootdata/BCD)