Author: jgardou
Date: Sat Aug 23 15:53:58 2014
New Revision: 63924
URL: http://svn.reactos.org/svn/reactos?rev=63924&view=rev
Log:
[CMAKE]
- Make a conditional copy of reactos.inf when it is really modified, make
reactos.acb depend on it.
Hopefully the last commit so that windows buildbot gets really fixed
Modified:
trunk/reactos/cmake/CMakeMacros.cmake
Modified: trunk/reactos/cmake/CMakeMacros.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?rev=63924&r1=63923&r2=63924&view=diff
==============================================================================
--- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sat Aug 23
15:53:58 2014
@@ -376,10 +376,17 @@
function(create_iso_lists)
# generate reactos.cab before anything else
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)
+ add_custom_command(
+ OUTPUT ${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)
+
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab
- COMMAND native-cabman -C
${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff -RC
${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.inf -N -P
${REACTOS_SOURCE_DIR}
- DEPENDS ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.inf
native-cabman ${_filelist})
+ COMMAND native-cabman -C
${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff -RC
${CMAKE_CURRENT_BINARY_DIR}/reactos.inf -N -P ${REACTOS_SOURCE_DIR}
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf native-cabman
${_filelist})
add_custom_target(reactos_cab DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/reactos.cab)
add_dependencies(reactos_cab reactos_cab_inf)
