Browse Source

Clean up location of nuttx specific template

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
sbg
Mark Charlebois 10 years ago
parent
commit
c16c6a00e3
  1. 1
      CMakeLists.txt
  2. 0
      cmake/nuttx/builtin_commands.c.in
  3. 2
      cmake/nuttx/px4_impl_nuttx.cmake
  4. 0
      cmake/qurt/px4_impl_qurt.cmake
  5. 2
      src/modules/systemlib/perf_counter.c

1
CMakeLists.txt

@ -111,6 +111,7 @@ set(package-contact "px4users@googlegroups.com") @@ -111,6 +111,7 @@ set(package-contact "px4users@googlegroups.com")
# set module path
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
set(board_impl_module px4_impl_${OS}_${BOARD})

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

2
cmake/px4_impl_nuttx.cmake → cmake/nuttx/px4_impl_nuttx.cmake

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

0
cmake/px4_impl_qurt.cmake → cmake/qurt/px4_impl_qurt.cmake

2
src/modules/systemlib/perf_counter.c

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

Loading…
Cancel
Save