dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Clean up location of nuttx specific template 

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
This commit is contained in:
Mark Charlebois 2015-09-08 13:54:43 -07:00
parent 29520dc5b1
commit c16c6a00e3
5 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -111,6 +111,7 @@ set(package-contact "px4users@googlegroups.com")
# set module path # set module path
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/${OS})
# prefer board implementation module over os implmementation module # prefer board implementation module over os implmementation module
set(board_impl_module px4_impl_${OS}_${BOARD}) set(board_impl_module px4_impl_${OS}_${BOARD})

0
cmake/builtin_commands.c.in → cmake/nuttx/builtin_commands.c.in
View File

2
cmake/px4_impl_nuttx.cmake → cmake/nuttx/px4_impl_nuttx.cmake
View File

@ -143,7 +143,7 @@ function(px4_nuttx_generate_builtin_commands)
math(EXPR command_count "${command_count}+1") math(EXPR command_count "${command_count}+1")
endif() endif()
endforeach() endforeach()
configure_file(${CMAKE_SOURCE_DIR}/cmake/builtin_commands.c.in configure_file(${CMAKE_SOURCE_DIR}/cmake/nuttx/builtin_commands.c.in
${OUT}) ${OUT})
endfunction() endfunction()

0
cmake/px4_impl_qurt.cmake → cmake/qurt/px4_impl_qurt.cmake
View File

2
src/modules/systemlib/perf_counter.c
View File

@ -49,7 +49,7 @@
#define dprintf(...) #define dprintf(...)
#define ddeclare(...) #define ddeclare(...)
#else #else
#define ddeclare(...) __VA_ARGS_ #define ddeclare(...) __VA_ARGS__
#endif #endif
/** /**