Browse Source

cmake: Unbreak all qurt and posix targets

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
sbg
Mark Charlebois 10 years ago
parent
commit
5aa3c45b63
  1. 7
      cmake/configs/config_nuttx_sim_simple.cmake
  2. 7
      cmake/configs/config_posix_eagle_default.cmake
  3. 7
      cmake/configs/config_posix_eagle_hil.cmake
  4. 7
      cmake/configs/config_posix_eagle_muorb.cmake
  5. 7
      cmake/configs/config_posix_eagle_release.cmake
  6. 11
      cmake/configs/config_qurt_eagle_hello.cmake
  7. 11
      cmake/configs/config_qurt_eagle_hil.cmake
  8. 10
      cmake/configs/config_qurt_eagle_muorb.cmake
  9. 10
      cmake/configs/config_qurt_eagle_release.cmake
  10. 10
      cmake/configs/config_qurt_eagle_test.cmake
  11. 10
      cmake/configs/config_qurt_eagle_travis.cmake

7
cmake/configs/config_nuttx_sim_simple.cmake

@ -2,7 +2,12 @@ include(nuttx/px4_impl_nuttx) @@ -2,7 +2,12 @@ include(nuttx/px4_impl_nuttx)
message(WARNING "this is a work in progress and doesn't build yet")
function(px4_get_config out_module_list)
function(px4_get_config)
px4_parse_function_args(
NAME px4_set_config_modules
ONE_VALUE OUT_MODULES OUT_FW_OPTS OUT_EXTRA_CMDS
ARGN ${ARGN})
set(config_module_list
platforms/nuttx

7
cmake/configs/config_posix_eagle_default.cmake

@ -1,6 +1,11 @@ @@ -1,6 +1,11 @@
include(posix/px4_impl_posix-arm)
function(px4_get_config out_module_list)
function(px4_get_config)
px4_parse_function_args(
NAME px4_set_config_modules
ONE_VALUE OUT_MODULES OUT_FW_OPTS OUT_EXTRA_CMDS
ARGN ${ARGN})
set(config_module_list
drivers/device

7
cmake/configs/config_posix_eagle_hil.cmake

@ -1,6 +1,11 @@ @@ -1,6 +1,11 @@
include(posix/px4_impl_posix-arm)
function(px4_get_config out_module_list)
function(px4_get_config)
px4_parse_function_args(
NAME px4_set_config_modules
ONE_VALUE OUT_MODULES OUT_FW_OPTS OUT_EXTRA_CMDS
ARGN ${ARGN})
set(config_module_list
drivers/device

7
cmake/configs/config_posix_eagle_muorb.cmake

@ -1,6 +1,11 @@ @@ -1,6 +1,11 @@
include(posix/px4_impl_posix-arm)
function(px4_get_config out_module_list)
function(px4_get_config)
px4_parse_function_args(
NAME px4_set_config_modules
ONE_VALUE OUT_MODULES OUT_FW_OPTS OUT_EXTRA_CMDS
ARGN ${ARGN})
set(config_module_list
drivers/device

7
cmake/configs/config_posix_eagle_release.cmake

@ -1,6 +1,11 @@ @@ -1,6 +1,11 @@
include(posix/px4_impl_posix-arm)
function(px4_get_config out_module_list)
function(px4_get_config)
px4_parse_function_args(
NAME px4_set_config_modules
ONE_VALUE OUT_MODULES OUT_FW_OPTS OUT_EXTRA_CMDS
ARGN ${ARGN})
set(config_module_list
drivers/device

11
cmake/configs/config_qurt_eagle_hello.cmake

@ -1,6 +1,12 @@ @@ -1,6 +1,12 @@
include(qurt/px4_impl_qurt)
function(px4_get_config out_module_list)
function(px4_get_config)
px4_parse_function_args(
NAME px4_set_config_modules
ONE_VALUE OUT_MODULES
REQUIRED OUT_MODULES
ARGN ${ARGN})
set(config_module_list
drivers/device
@ -26,5 +32,8 @@ function(px4_get_config out_module_list) @@ -26,5 +32,8 @@ function(px4_get_config out_module_list)
)
set(${out_module_list} ${config_module_list} PARENT_SCOPE)
# output
set(${OUT_MODULES} ${config_module_list} PARENT_SCOPE)
endfunction()

11
cmake/configs/config_qurt_eagle_hil.cmake

@ -1,6 +1,12 @@ @@ -1,6 +1,12 @@
include(qurt/px4_impl_qurt)
function(px4_get_config out_module_list)
function(px4_get_config)
px4_parse_function_args(
NAME px4_set_config_modules
ONE_VALUE OUT_MODULES
REQUIRED OUT_MODULES
ARGN ${ARGN})
set(config_module_list
drivers/device
@ -60,7 +66,8 @@ function(px4_get_config out_module_list) @@ -60,7 +66,8 @@ function(px4_get_config out_module_list)
#
modules/muorb/adsp
)
set(${out_module_list} ${config_module_list} PARENT_SCOPE)
set(${OUT_MODULES} ${config_module_list} PARENT_SCOPE)
endfunction()

10
cmake/configs/config_qurt_eagle_muorb.cmake

@ -1,6 +1,12 @@ @@ -1,6 +1,12 @@
include(qurt/px4_impl_qurt)
function(px4_get_config out_module_list)
function(px4_get_config)
px4_parse_function_args(
NAME px4_set_config_modules
ONE_VALUE OUT_MODULES
REQUIRED
ARGN ${ARGN})
set(config_module_list
drivers/device
@ -38,7 +44,7 @@ function(px4_get_config out_module_list) @@ -38,7 +44,7 @@ function(px4_get_config out_module_list)
#
modules/muorb/adsp
)
set(${out_module_list} ${config_module_list} PARENT_SCOPE)
set(${OUT_MODULES} ${config_module_list} PARENT_SCOPE)
endfunction()

10
cmake/configs/config_qurt_eagle_release.cmake

@ -19,7 +19,13 @@ set(target_libraries @@ -19,7 +19,13 @@ set(target_libraries
rc_receiver
)
function(px4_get_config out_module_list)
function(px4_get_config)
px4_parse_function_args(
NAME px4_set_config_modules
ONE_VALUE OUT_MODULES
REQUIRED OUT_MODULES
ARGN ${ARGN})
set(config_module_list
#
@ -81,6 +87,6 @@ function(px4_get_config out_module_list) @@ -81,6 +87,6 @@ function(px4_get_config out_module_list)
#
modules/muorb/adsp
)
set(${out_module_list} ${config_module_list} PARENT_SCOPE)
set(${OUT_MODULES} ${config_module_list} PARENT_SCOPE)
endfunction()

10
cmake/configs/config_qurt_eagle_test.cmake

@ -1,6 +1,12 @@ @@ -1,6 +1,12 @@
include(qurt/px4_impl_qurt)
function(px4_get_config out_module_list)
function(px4_get_config)
px4_parse_function_args(
NAME px4_set_config_modules
ONE_VALUE OUT_MODULES
REQUIRED OUT_MODULES
ARGN ${ARGN})
set(config_module_list
drivers/device
@ -35,7 +41,7 @@ function(px4_get_config out_module_list) @@ -35,7 +41,7 @@ function(px4_get_config out_module_list)
platforms/qurt/tests/hrt_test
platforms/qurt/tests/wqueue
)
set(${out_module_list} ${config_module_list} PARENT_SCOPE)
set(${OUT_MODULES} ${config_module_list} PARENT_SCOPE)
endfunction()

10
cmake/configs/config_qurt_eagle_travis.cmake

@ -3,7 +3,13 @@ include(qurt/px4_impl_qurt) @@ -3,7 +3,13 @@ include(qurt/px4_impl_qurt)
# Run a full link with build stubs to make sure qurt target isn't broken
set(QURT_ENABLE_STUBS 1)
function(px4_get_config out_module_list)
function(px4_get_config)
px4_parse_function_args(
NAME px4_set_config_modules
ONE_VALUE OUT_MODULES
REQUIRED OUT_MODULES
ARGN ${ARGN})
set(config_module_list
drivers/device
@ -63,7 +69,7 @@ function(px4_get_config out_module_list) @@ -63,7 +69,7 @@ function(px4_get_config out_module_list)
#
modules/muorb/adsp
)
set(${out_module_list} ${config_module_list} PARENT_SCOPE)
set(${OUT_MODULES} ${config_module_list} PARENT_SCOPE)
endfunction()

Loading…
Cancel
Save