[ros-diffs] [akhaldi] 52148: [CMAKE] * Fix reactos.cab creation.
akhaldi at svn.reactos.org
akhaldi at svn.reactos.org
Wed Jun 8 13:58:34 UTC 2011
Author: akhaldi
Date: Wed Jun 8 13:58:33 2011
New Revision: 52148
URL: http://svn.reactos.org/svn/reactos?rev=52148&view=rev
Log:
[CMAKE]
* Fix reactos.cab creation.
Modified:
trunk/reactos/boot/bootdata/packages/CMakeLists.txt
Modified: trunk/reactos/boot/bootdata/packages/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/CMakeLists.txt?rev=52148&r1=52147&r2=52148&view=diff
==============================================================================
--- trunk/reactos/boot/bootdata/packages/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/packages/CMakeLists.txt [iso-8859-1] Wed Jun 8 13:58:33 2011
@@ -31,17 +31,11 @@
add_custom_command(
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}
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff
-)
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff)
-# Then we create the actual cab file
-add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab
+# Then we create the actual cab file using a custom target
+add_custom_target(reactos_cab
COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -RC ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf -L ${CMAKE_CURRENT_BINARY_DIR} -N -P ${REACTOS_SOURCE_DIR}
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf
-)
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf)
-# Finally, we create the reactos_cab target
-add_custom_target(reactos_cab ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab)
-
add_cd_file(TARGET reactos_cab FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf DESTINATION reactos NO_CAB FOR bootcd regtest)
More information about the Ros-diffs
mailing list