From c8ed53856bd00bd72612ab653ab40d5bee6fc1a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Sat, 23 Aug 2014 14:40:00 +0000 Subject: [PATCH] [CMAKE] - make reactos_cab_inf an unconditional target. Should fix windows testbot svn path=/trunk/; revision=63921 --- reactos/boot/bootdata/packages/CMakeLists.txt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/reactos/boot/bootdata/packages/CMakeLists.txt b/reactos/boot/bootdata/packages/CMakeLists.txt index d65a1049cb6..f9d1e847acc 100644 --- a/reactos/boot/bootdata/packages/CMakeLists.txt +++ b/reactos/boot/bootdata/packages/CMakeLists.txt @@ -31,17 +31,13 @@ add_custom_command( DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn ) -# And now we build reactos.inf -add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf +add_custom_target( + reactos_cab_inf 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) -# reactos.cab generation will be made later (cf. CMakeMacros.cmake - create iso lists) -add_custom_target(reactos_cab_inf DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf) - add_cd_file( - TARGET reactos_cab + TARGET reactos_cab_inf FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf DESTINATION reactos NO_CAB FOR bootcd regtest)