From 5aa3c45b63f459861ceebefc46e044e87c2a67c0 Mon Sep 17 00:00:00 2001 From: Mark Charlebois Date: Thu, 10 Sep 2015 19:01:51 -0700 Subject: [PATCH] cmake: Unbreak all qurt and posix targets Signed-off-by: Mark Charlebois --- cmake/configs/config_nuttx_sim_simple.cmake | 7 ++++++- cmake/configs/config_posix_eagle_default.cmake | 7 ++++++- cmake/configs/config_posix_eagle_hil.cmake | 7 ++++++- cmake/configs/config_posix_eagle_muorb.cmake | 7 ++++++- cmake/configs/config_posix_eagle_release.cmake | 7 ++++++- cmake/configs/config_qurt_eagle_hello.cmake | 11 ++++++++++- cmake/configs/config_qurt_eagle_hil.cmake | 11 +++++++++-- cmake/configs/config_qurt_eagle_muorb.cmake | 10 ++++++++-- cmake/configs/config_qurt_eagle_release.cmake | 10 ++++++++-- cmake/configs/config_qurt_eagle_test.cmake | 10 ++++++++-- cmake/configs/config_qurt_eagle_travis.cmake | 10 ++++++++-- 11 files changed, 81 insertions(+), 16 deletions(-) diff --git a/cmake/configs/config_nuttx_sim_simple.cmake b/cmake/configs/config_nuttx_sim_simple.cmake index a44f8e9597..79446ae7bc 100644 --- a/cmake/configs/config_nuttx_sim_simple.cmake +++ b/cmake/configs/config_nuttx_sim_simple.cmake @@ -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 diff --git a/cmake/configs/config_posix_eagle_default.cmake b/cmake/configs/config_posix_eagle_default.cmake index 77b6716e88..04f80c7523 100644 --- a/cmake/configs/config_posix_eagle_default.cmake +++ b/cmake/configs/config_posix_eagle_default.cmake @@ -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 diff --git a/cmake/configs/config_posix_eagle_hil.cmake b/cmake/configs/config_posix_eagle_hil.cmake index fb1c82ddbe..115f70d406 100644 --- a/cmake/configs/config_posix_eagle_hil.cmake +++ b/cmake/configs/config_posix_eagle_hil.cmake @@ -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 diff --git a/cmake/configs/config_posix_eagle_muorb.cmake b/cmake/configs/config_posix_eagle_muorb.cmake index b8e75586be..44fe4cebe0 100644 --- a/cmake/configs/config_posix_eagle_muorb.cmake +++ b/cmake/configs/config_posix_eagle_muorb.cmake @@ -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 diff --git a/cmake/configs/config_posix_eagle_release.cmake b/cmake/configs/config_posix_eagle_release.cmake index 9b7b315727..90c81fd411 100644 --- a/cmake/configs/config_posix_eagle_release.cmake +++ b/cmake/configs/config_posix_eagle_release.cmake @@ -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 diff --git a/cmake/configs/config_qurt_eagle_hello.cmake b/cmake/configs/config_qurt_eagle_hello.cmake index 38028ff57e..4969d2af34 100644 --- a/cmake/configs/config_qurt_eagle_hello.cmake +++ b/cmake/configs/config_qurt_eagle_hello.cmake @@ -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) ) set(${out_module_list} ${config_module_list} PARENT_SCOPE) + # output + set(${OUT_MODULES} ${config_module_list} PARENT_SCOPE) + endfunction() diff --git a/cmake/configs/config_qurt_eagle_hil.cmake b/cmake/configs/config_qurt_eagle_hil.cmake index 857ad6b570..f5bc10f324 100644 --- a/cmake/configs/config_qurt_eagle_hil.cmake +++ b/cmake/configs/config_qurt_eagle_hil.cmake @@ -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) # modules/muorb/adsp ) - set(${out_module_list} ${config_module_list} PARENT_SCOPE) + + set(${OUT_MODULES} ${config_module_list} PARENT_SCOPE) endfunction() diff --git a/cmake/configs/config_qurt_eagle_muorb.cmake b/cmake/configs/config_qurt_eagle_muorb.cmake index 38618dc2bd..1ef1711c30 100644 --- a/cmake/configs/config_qurt_eagle_muorb.cmake +++ b/cmake/configs/config_qurt_eagle_muorb.cmake @@ -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) # modules/muorb/adsp ) - set(${out_module_list} ${config_module_list} PARENT_SCOPE) + set(${OUT_MODULES} ${config_module_list} PARENT_SCOPE) endfunction() diff --git a/cmake/configs/config_qurt_eagle_release.cmake b/cmake/configs/config_qurt_eagle_release.cmake index 5cbd611cdf..87b1592757 100644 --- a/cmake/configs/config_qurt_eagle_release.cmake +++ b/cmake/configs/config_qurt_eagle_release.cmake @@ -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) # modules/muorb/adsp ) - set(${out_module_list} ${config_module_list} PARENT_SCOPE) + set(${OUT_MODULES} ${config_module_list} PARENT_SCOPE) endfunction() diff --git a/cmake/configs/config_qurt_eagle_test.cmake b/cmake/configs/config_qurt_eagle_test.cmake index 1845568e8b..a607a0be2b 100644 --- a/cmake/configs/config_qurt_eagle_test.cmake +++ b/cmake/configs/config_qurt_eagle_test.cmake @@ -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) 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() diff --git a/cmake/configs/config_qurt_eagle_travis.cmake b/cmake/configs/config_qurt_eagle_travis.cmake index 713c858a44..d55c7597e5 100644 --- a/cmake/configs/config_qurt_eagle_travis.cmake +++ b/cmake/configs/config_qurt_eagle_travis.cmake @@ -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) # modules/muorb/adsp ) - set(${out_module_list} ${config_module_list} PARENT_SCOPE) + set(${OUT_MODULES} ${config_module_list} PARENT_SCOPE) endfunction()