Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 09:13:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
- Try a ninja (the warrior) technique to finally get the dependencies on reactos.cab right

svn path=/trunk/; revision=63927
This commit is contained in:
Jérôme Gardou 2014-08-23 16:47:58 +00:00
parent 21435dd1ae
commit 2e0d75e093
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
reactos/cmake/CMakeMacros.cmake
View file

@ -377,11 +377,11 @@ function(create_iso_lists)
# generate reactos.cab before anything else # generate reactos.cab before anything else
get_property(_filelist GLOBAL PROPERTY REACTOS_CAB_DEPENDS) get_property(_filelist GLOBAL PROPERTY REACTOS_CAB_DEPENDS)
# begin with reactos.inf. It doesn't depend on anything so that it's always generated (that's for optional modules) # begin with reactos.inf. We want this command to be always executed, so we pretend it generates another file although it will never do.
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf ${CMAKE_CURRENT_BINARY_DIR}/__some_non_existent_file
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.inf ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf COMMAND ${CMAKE_COMMAND} -E copy_if_different ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.inf ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf
DEPENDS ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.inf) DEPENDS ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.inf reactos_cab_inf)
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab