Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
- make reactos_cab_inf an unconditional target.
Should fix windows testbot

svn path=/trunk/; revision=63921
This commit is contained in:
Jérôme Gardou 2014-08-23 14:40:00 +00:00
parent ec5927ad19
commit c8ed53856b
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/boot/bootdata/packages/CMakeLists.txt
View file

@ -31,17 +31,13 @@ add_custom_command(
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn
) )
# And now we build reactos.inf add_custom_target(
add_custom_command( reactos_cab_inf
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf
COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -L ${CMAKE_CURRENT_BINARY_DIR} -I -P ${REACTOS_SOURCE_DIR} 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) 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( add_cd_file(
TARGET reactos_cab TARGET reactos_cab_inf
FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf
DESTINATION reactos DESTINATION reactos
NO_CAB FOR bootcd regtest) NO_CAB FOR bootcd regtest)