From f13daa73147427ca78149913529854e4a9824ab3 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Tue, 6 Oct 2015 14:32:31 -0400 Subject: [PATCH] cmake fix NuttX copy -on the 2nd run this was copying NuttX to NuttX/Nuttx --- cmake/nuttx/px4_impl_nuttx.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmake/nuttx/px4_impl_nuttx.cmake b/cmake/nuttx/px4_impl_nuttx.cmake index f48bdc135c..13d120af26 100644 --- a/cmake/nuttx/px4_impl_nuttx.cmake +++ b/cmake/nuttx/px4_impl_nuttx.cmake @@ -213,8 +213,7 @@ function(px4_nuttx_add_export) # copy add_custom_command(OUTPUT nuttx_copy_${CONFIG}.stamp COMMAND ${MKDIR} -p ${CMAKE_BINARY_DIR}/${CONFIG} - COMMAND ${CP} -r ${CMAKE_SOURCE_DIR}/NuttX ${nuttx_src} - COMMAND ${RM} -rf ${nuttx_src}/.git + COMMAND rsync -a --exclude=.git ${CMAKE_SOURCE_DIR}/NuttX/ ${nuttx_src}/ COMMAND ${TOUCH} nuttx_copy_${CONFIG}.stamp DEPENDS ${DEPENDS}) add_custom_target(__nuttx_copy_${CONFIG}