From 343593618916418c7f3d16efa9fa603231eac1fb Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Fri, 7 Apr 2017 09:40:08 -1000 Subject: [PATCH] Force the patches to be applied in order again! While the list was sorted, this change serialize the application of the patches. Moved the disply to the actual application of the patch not the configuration step. --- cmake/nuttx/px4_impl_nuttx.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cmake/nuttx/px4_impl_nuttx.cmake b/cmake/nuttx/px4_impl_nuttx.cmake index 02c2bb4640..f9e0426187 100644 --- a/cmake/nuttx/px4_impl_nuttx.cmake +++ b/cmake/nuttx/px4_impl_nuttx.cmake @@ -268,21 +268,23 @@ function(px4_nuttx_add_export) add_custom_target(nuttx_copy_${CONFIG} DEPENDS ${PX4_BINARY_DIR}/nuttx_copy_${CONFIG}.stamp) # patch + unset (last_patch ) add_custom_target(nuttx_patch_${CONFIG}) foreach(patch ${nuttx_patches}) get_filename_component(patch_file_name ${patch} NAME) - message(STATUS "${CONFIG} NuttX patch: nuttx-patches/${patch_file_name}") string(REPLACE "/" "_" patch_name "nuttx_patch_${patch_file_name}-${CONFIG}") set(patch_stamp ${nuttx_src}/${patch_name}.stamp) add_custom_command(OUTPUT ${patch_stamp} COMMAND ${PATCH} -d ${nuttx_src} -s -p1 -N < ${patch} COMMAND ${TOUCH} ${patch_stamp} - DEPENDS ${DEPENDS} nuttx_copy_${CONFIG} ${patch} - COMMENT "Applying ${patch}") + DEPENDS ${last_patch} ${DEPENDS} nuttx_copy_${CONFIG} ${patch} + USES_TERMINAL + COMMENT "${CONFIG} Applying NuttX patch: nuttx-patches/${patch_file_name}") add_custom_target(${patch_name} DEPENDS ${patch_stamp}) add_dependencies(nuttx_patch_${CONFIG} ${patch_name}) + set (last_patch ${patch_name}) endforeach() # Read defconfig to see if CONFIG_ARMV7M_STACKCHECK is yes