https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95d873091b8ef49aa82f2…
commit 95d873091b8ef49aa82f2cec15f3c18617e70d6d
Author: Jérôme Gardou <jerome.gardou(a)reactos.org>
AuthorDate: Wed Oct 28 15:09:15 2020 +0100
Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com>
CommitDate: Wed Oct 28 18:03:34 2020 +0100
[CMAKE] Make reactos_cab_inf really depend on reactos.inf
Instead of being always out of date & always trigger reactos.cab creation
---
boot/bootdata/packages/CMakeLists.txt | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/boot/bootdata/packages/CMakeLists.txt
b/boot/bootdata/packages/CMakeLists.txt
index 3f1cc6ff00c..4b11979b6a1 100644
--- a/boot/bootdata/packages/CMakeLists.txt
+++ b/boot/bootdata/packages/CMakeLists.txt
@@ -31,17 +31,19 @@ add_custom_command(
-D
SRC2=${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.$<CONFIG>.dyn
-D DST=${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.maydiff
-P ${CMAKE_CURRENT_BINARY_DIR}/concat.cmake
- COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.maydiff
${CMAKE_CURRENT_BINARY_DIR}/reactos.dff
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/reactos.dff.in
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.$<CONFIG>.dyn)
-add_custom_target(
- reactos_cab_inf
+add_custom_command(
COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -L
${CMAKE_CURRENT_BINARY_DIR} -I -P ${REACTOS_SOURCE_DIR}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff native-cabman
- BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf)
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf)
+
+add_custom_target(
+ reactos_cab_inf DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf)
add_cd_file(
TARGET reactos_cab_inf