diff --git a/cmake/configs/posix_eagle_default.cmake b/cmake/configs/posix_eagle_default.cmake index 17fcc337ff..8bee815a8b 100644 --- a/cmake/configs/posix_eagle_default.cmake +++ b/cmake/configs/posix_eagle_default.cmake @@ -1,56 +1,44 @@ include(posix/px4_impl_posix) -set(USE_TOOLCHAIN Toolchain-arm-linux-gnueabihf) +set(CMAKE_TOOLCHAIN_FILE cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake) -function(px4_get_config) +set(config_module_list + drivers/device + drivers/blinkm + drivers/pwm_out_sim + drivers/rgbled + drivers/led + modules/sensors - px4_parse_function_args( - NAME px4_set_config_modules - ONE_VALUE OUT_MODULES - REQUIRED OUT_MODULES - ARGN ${ARGN}) + systemcmds/param + systemcmds/mixer + systemcmds/ver - set(config_module_list - drivers/device - drivers/blinkm - drivers/pwm_out_sim - drivers/rgbled - drivers/led - modules/sensors + modules/mavlink - systemcmds/param - systemcmds/mixer - systemcmds/ver + modules/attitude_estimator_ekf + modules/ekf_att_pos_estimator - modules/mavlink + modules/mc_pos_control + modules/mc_att_control - modules/attitude_estimator_ekf - modules/ekf_att_pos_estimator + modules/systemlib + modules/systemlib/mixer + modules/uORB + modules/sensors + modules/dataman + modules/sdlog2 + modules/simulator + modules/commander + modules/controllib - modules/mc_pos_control - modules/mc_att_control + lib/mathlib + lib/mathlib/math/filter + lib/geo + lib/geo_lookup + lib/conversion - modules/systemlib - modules/systemlib/mixer - modules/uORB - modules/sensors - modules/dataman - modules/sdlog2 - modules/simulator - modules/commander - modules/controllib - - lib/mathlib - lib/mathlib/math/filter - lib/geo - lib/geo_lookup - lib/conversion - - platforms/posix/px4_layer - platforms/posix/work_queue - ) - - set(${OUT_MODULES} ${config_module_list} PARENT_SCOPE) - -endfunction() + platforms/posix/px4_layer + platforms/posix/work_queue + ) diff --git a/cmake/configs/posix_eagle_hil.cmake b/cmake/configs/posix_eagle_hil.cmake index aa87bd6bb6..fc771f3d89 100644 --- a/cmake/configs/posix_eagle_hil.cmake +++ b/cmake/configs/posix_eagle_hil.cmake @@ -1,45 +1,33 @@ include(posix/px4_impl_posix) -set(USE_TOOLCHAIN Toolchain-arm-linux-gnueabihf) +set(CMAKE_TOOLCHAIN_FILE cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake) -function(px4_get_config) +set(config_module_list + drivers/device + drivers/boards/sitl + drivers/led - px4_parse_function_args( - NAME px4_set_config_modules - ONE_VALUE OUT_MODULES - REQUIRED OUT_MODULES - ARGN ${ARGN}) + systemcmds/param + systemcmds/ver - set(config_module_list - drivers/device - drivers/boards/sitl - drivers/led + modules/mavlink - systemcmds/param - systemcmds/ver + modules/systemlib + modules/uORB + modules/sensors + modules/dataman + modules/sdlog2 + modules/simulator + modules/commander - modules/mavlink + lib/mathlib + lib/mathlib/math/filter + lib/geo + lib/geo_lookup + lib/conversion - modules/systemlib - modules/uORB - modules/sensors - modules/dataman - modules/sdlog2 - modules/simulator - modules/commander - - lib/mathlib - lib/mathlib/math/filter - lib/geo - lib/geo_lookup - lib/conversion - - platforms/posix/px4_layer - platforms/posix/work_queue - modules/muorb/krait - ) - - set(${OUT_MODULES} ${config_module_list} PARENT_SCOPE) - -endfunction() + platforms/posix/px4_layer + platforms/posix/work_queue + modules/muorb/krait + ) diff --git a/cmake/configs/posix_eagle_muorb.cmake b/cmake/configs/posix_eagle_muorb.cmake index 450d7b1e4e..813fbbfecb 100644 --- a/cmake/configs/posix_eagle_muorb.cmake +++ b/cmake/configs/posix_eagle_muorb.cmake @@ -1,27 +1,15 @@ -include(posix/px4_impl_posix-arm) +include(posix/px4_impl_posix) -set(USE_TOOLCHAIN Toolchain-arm-linux-gnueabihf) +set(CMAKE_TOOLCHAIN_FILE cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake) -function(px4_get_config) +set(config_module_list + drivers/device - px4_parse_function_args( - NAME px4_set_config_modules - ONE_VALUE OUT_MODULES - REQUIRED OUT_MODULES - ARGN ${ARGN}) + modules/uORB - set(config_module_list - drivers/device + platforms/posix/px4_layer + platforms/posix/work_queue - modules/uORB - - platforms/posix/px4_layer - platforms/posix/work_queue - - modules/muorb/krait - ) - - set(${OUT_MODULES} ${config_module_list} PARENT_SCOPE) - -endfunction() + modules/muorb/krait + ) diff --git a/cmake/configs/posix_eagle_release.cmake b/cmake/configs/posix_eagle_release.cmake index fad14f595f..cb3019ae2b 100644 --- a/cmake/configs/posix_eagle_release.cmake +++ b/cmake/configs/posix_eagle_release.cmake @@ -1,39 +1,28 @@ include(posix/px4_impl_posix) -set(USE_TOOLCHAIN Toolchain-arm-linux-gnueabihf) +set(CMAKE_TOOLCHAIN_FILE cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake) -function(px4_get_config) +set(config_module_list + drivers/device - px4_parse_function_args( - NAME px4_set_config_modules - ONE_VALUE OUT_MODULES - ARGN ${ARGN}) + systemcmds/param + systemcmds/ver - set(config_module_list - drivers/device + modules/mavlink - systemcmds/param - systemcmds/ver + modules/systemlib + modules/uORB + modules/dataman - modules/mavlink + lib/mathlib + lib/mathlib/math/filter + lib/geo + lib/geo_lookup + lib/conversion - modules/systemlib - modules/uORB - modules/dataman + platforms/posix/px4_layer + platforms/posix/work_queue - lib/mathlib - lib/mathlib/math/filter - lib/geo - lib/geo_lookup - lib/conversion - - platforms/posix/px4_layer - platforms/posix/work_queue - - modules/muorb/krait - ) - - set(${OUT_MODULES} ${config_module_list} PARENT_SCOPE) - -endfunction() + modules/muorb/krait + ) diff --git a/cmake/configs/qurt_eagle_hello.cmake b/cmake/configs/qurt_eagle_hello.cmake index 4969d2af34..43db471f69 100644 --- a/cmake/configs/qurt_eagle_hello.cmake +++ b/cmake/configs/qurt_eagle_hello.cmake @@ -1,35 +1,29 @@ include(qurt/px4_impl_qurt) -function(px4_get_config) +set(CMAKE_TOOLCHAIN_FILE cmake/toolchains/Toolchain-hexagon.cmake) - px4_parse_function_args( - NAME px4_set_config_modules - ONE_VALUE OUT_MODULES - REQUIRED OUT_MODULES - ARGN ${ARGN}) +set(config_module_list + drivers/device - set(config_module_list - drivers/device + # + # System commands + # + systemcmds/param - # - # System commands - # - systemcmds/param + # + # Library modules + # + modules/systemlib + modules/uORB - # - # Library modules - # - modules/systemlib - modules/uORB - - # - # QuRT port - # - platforms/common - platforms/qurt/px4_layer - platforms/posix/work_queue - platforms/qurt/tests/hello - ) + # + # QuRT port + # + platforms/common + platforms/qurt/px4_layer + platforms/posix/work_queue + platforms/qurt/tests/hello + ) set(${out_module_list} ${config_module_list} PARENT_SCOPE) # output diff --git a/cmake/configs/qurt_eagle_hil.cmake b/cmake/configs/qurt_eagle_hil.cmake index 378915c373..e661ca5b62 100644 --- a/cmake/configs/qurt_eagle_hil.cmake +++ b/cmake/configs/qurt_eagle_hil.cmake @@ -1,75 +1,62 @@ include(qurt/px4_impl_qurt) -set(USE_TOOLCHAIN Toolchain-hexagon) +set(CMAKE_TOOLCHAIN_FILE cmake/toolchains/Toolchain-hexagon.cmake) -function(px4_get_config) +set(config_module_list + drivers/device + drivers/boards/sitl + drivers/pwm_out_sim + drivers/led + drivers/rgbled + modules/sensors - px4_parse_function_args( - NAME px4_set_config_modules - ONE_VALUE OUT_MODULES - REQUIRED OUT_MODULES - ARGN ${ARGN}) + # + # System commands + # + systemcmds/param + systemcmds/mixer - set(config_module_list - drivers/device - drivers/boards/sitl - drivers/pwm_out_sim - drivers/led - drivers/rgbled - modules/sensors + # + # Estimation modules (EKF/ SO3 / other filters) + # + #modules/attitude_estimator_ekf + modules/ekf_att_pos_estimator + modules/attitude_estimator_q + modules/position_estimator_inav - # - # System commands - # - systemcmds/param - systemcmds/mixer + # + # Vehicle Control + # + modules/mc_att_control + modules/mc_pos_control - # - # Estimation modules (EKF/ SO3 / other filters) - # - #modules/attitude_estimator_ekf - modules/ekf_att_pos_estimator - modules/attitude_estimator_q - modules/position_estimator_inav + # + # Library modules + # + modules/systemlib + modules/systemlib/mixer + modules/uORB + modules/commander - # - # Vehicle Control - # - modules/mc_att_control - modules/mc_pos_control + # + # Libraries + # + lib/mathlib + lib/mathlib/math/filter + lib/geo + lib/geo_lookup + lib/conversion + modules/controllib - # - # Library modules - # - modules/systemlib - modules/systemlib/mixer - modules/uORB - modules/commander - - # - # Libraries - # - lib/mathlib - lib/mathlib/math/filter - lib/geo - lib/geo_lookup - lib/conversion - modules/controllib - - # - # QuRT port - # - platforms/common - platforms/qurt/px4_layer - platforms/posix/work_queue - - # - # sources for muorb over fastrpc - # - modules/muorb/adsp - ) - - set(${OUT_MODULES} ${config_module_list} PARENT_SCOPE) - -endfunction() + # + # QuRT port + # + platforms/common + platforms/qurt/px4_layer + platforms/posix/work_queue + # + # sources for muorb over fastrpc + # + modules/muorb/adsp + ) diff --git a/cmake/configs/qurt_eagle_muorb.cmake b/cmake/configs/qurt_eagle_muorb.cmake index 1ef1711c30..5c83f9e68d 100644 --- a/cmake/configs/qurt_eagle_muorb.cmake +++ b/cmake/configs/qurt_eagle_muorb.cmake @@ -1,50 +1,40 @@ include(qurt/px4_impl_qurt) -function(px4_get_config) +set(CMAKE_TOOLCHAIN_FILE cmake/toolchains/Toolchain-hexagon.cmake) - px4_parse_function_args( - NAME px4_set_config_modules - ONE_VALUE OUT_MODULES - REQUIRED - ARGN ${ARGN}) +set(config_module_list + drivers/device - set(config_module_list - drivers/device + # + # System commands + # + systemcmds/param - # - # System commands - # - systemcmds/param + # + # Library modules + # + modules/systemlib + modules/uORB - # - # Library modules - # - modules/systemlib - modules/uORB + # + # Libraries + # + lib/mathlib + lib/mathlib/math/filter + lib/geo + lib/geo_lookup + lib/conversion - # - # Libraries - # - lib/mathlib - lib/mathlib/math/filter - lib/geo - lib/geo_lookup - lib/conversion - - # - # QuRT port - # - platforms/common - platforms/qurt/px4_layer - platforms/posix/work_queue - platforms/qurt/tests/muorb - - # - # sources for muorb over fastrpc - # - modules/muorb/adsp - ) - set(${OUT_MODULES} ${config_module_list} PARENT_SCOPE) - -endfunction() + # + # QuRT port + # + platforms/common + platforms/qurt/px4_layer + platforms/posix/work_queue + platforms/qurt/tests/muorb + # + # sources for muorb over fastrpc + # + modules/muorb/adsp + ) diff --git a/cmake/configs/qurt_eagle_release.cmake b/cmake/configs/qurt_eagle_release.cmake index 87b1592757..1807e0b56c 100644 --- a/cmake/configs/qurt_eagle_release.cmake +++ b/cmake/configs/qurt_eagle_release.cmake @@ -19,74 +19,66 @@ set(target_libraries rc_receiver ) -function(px4_get_config) - px4_parse_function_args( - NAME px4_set_config_modules - ONE_VALUE OUT_MODULES - REQUIRED OUT_MODULES - ARGN ${ARGN}) +set(CMAKE_TOOLCHAIN_FILE cmake/toolchains/Toolchain-hexagon.cmake) - set(config_module_list - # - # Board support modules - # - drivers/device - modules/sensors - $(EAGLE_DRIVERS_SRC)/mpu9x50 - $(EAGLE_DRIVERS_SRC)/uart_esc - $(EAGLE_DRIVERS_SRC)/rc_receiver - $(EAGLE_DRIVERS_SRC)/csr_gps +set(config_module_list + # + # Board support modules + # + drivers/device + modules/sensors + $(EAGLE_DRIVERS_SRC)/mpu9x50 + $(EAGLE_DRIVERS_SRC)/uart_esc + $(EAGLE_DRIVERS_SRC)/rc_receiver + $(EAGLE_DRIVERS_SRC)/csr_gps - # - # System commands - # - systemcmds/param + # + # System commands + # + systemcmds/param - # - # Estimation modules (EKF/ SO3 / other filters) - # - #modules/attitude_estimator_ekf - modules/ekf_att_pos_estimator - modules/attitude_estimator_q - modules/position_estimator_inav + # + # Estimation modules (EKF/ SO3 / other filters) + # + #modules/attitude_estimator_ekf + modules/ekf_att_pos_estimator + modules/attitude_estimator_q + modules/position_estimator_inav - # - # Vehicle Control - # - modules/mc_att_control - modules/mc_pos_control + # + # Vehicle Control + # + modules/mc_att_control + modules/mc_pos_control - # - # Library modules - # - modules/systemlib - modules/systemlib/mixer - modules/uORB - modules/commander - modules/controllib + # + # Library modules + # + modules/systemlib + modules/systemlib/mixer + modules/uORB + modules/commander + modules/controllib - # - # Libraries - # - lib/mathlib - lib/mathlib/math/filter - lib/geo - lib/geo_lookup - lib/conversion + # + # Libraries + # + lib/mathlib + lib/mathlib/math/filter + lib/geo + lib/geo_lookup + lib/conversion - # - # QuRT port - # - platforms/common - platforms/qurt/px4_layer - platforms/posix/work_queue + # + # QuRT port + # + platforms/common + platforms/qurt/px4_layer + platforms/posix/work_queue - # - # sources for muorb over fastrpc - # - modules/muorb/adsp - ) - set(${OUT_MODULES} ${config_module_list} PARENT_SCOPE) - -endfunction() + # + # sources for muorb over fastrpc + # + modules/muorb/adsp + ) diff --git a/cmake/configs/qurt_eagle_test.cmake b/cmake/configs/qurt_eagle_test.cmake index a607a0be2b..501c7fbeb8 100644 --- a/cmake/configs/qurt_eagle_test.cmake +++ b/cmake/configs/qurt_eagle_test.cmake @@ -1,47 +1,38 @@ include(qurt/px4_impl_qurt) -function(px4_get_config) +set(CMAKE_TOOLCHAIN_FILE cmake/toolchains/Toolchain-hexagon.cmake) - px4_parse_function_args( - NAME px4_set_config_modules - ONE_VALUE OUT_MODULES - REQUIRED OUT_MODULES - ARGN ${ARGN}) +set(config_module_list + drivers/device - set(config_module_list - drivers/device + # + # System commands + # + systemcmds/param - # - # System commands - # - systemcmds/param + # + # Library modules + # + modules/systemlib + modules/mixer + modules/uORB - # - # Library modules - # - modules/systemlib - modules/mixer - modules/uORB + # + # Libraries + # + lib/mathlib + lib/mathlib/math/filter + lib/conversion - # - # Libraries - # - lib/mathlib - lib/mathlib/math/filter - lib/conversion - - # - # QuRT port - # - platforms/common - platforms/qurt/px4_layer - platforms/posix/work_queue - platforms/qurt/tests/hello - platforms/qurt/tests/vcdev_test - platforms/qurt/tests/hrt_test - platforms/qurt/tests/wqueue - ) - set(${OUT_MODULES} ${config_module_list} PARENT_SCOPE) - -endfunction() + # + # QuRT port + # + platforms/common + platforms/qurt/px4_layer + platforms/posix/work_queue + platforms/qurt/tests/hello + platforms/qurt/tests/vcdev_test + platforms/qurt/tests/hrt_test + platforms/qurt/tests/wqueue + ) diff --git a/cmake/configs/qurt_eagle_travis.cmake b/cmake/configs/qurt_eagle_travis.cmake index d55c7597e5..61b171d14d 100644 --- a/cmake/configs/qurt_eagle_travis.cmake +++ b/cmake/configs/qurt_eagle_travis.cmake @@ -3,73 +3,64 @@ 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) +set(CMAKE_TOOLCHAIN_FILE cmake/toolchains/Toolchain-hexagon.cmake) - px4_parse_function_args( - NAME px4_set_config_modules - ONE_VALUE OUT_MODULES - REQUIRED OUT_MODULES - ARGN ${ARGN}) +set(config_module_list + drivers/device + drivers/boards/sitl + drivers/pwm_out_sim + drivers/led + drivers/rgbled + modules/sensors - set(config_module_list - drivers/device - drivers/boards/sitl - drivers/pwm_out_sim - drivers/led - drivers/rgbled - modules/sensors + # + # System commands + # + systemcmds/param + systemcmds/mixer - # - # System commands - # - systemcmds/param - systemcmds/mixer + # + # Estimation modules (EKF/ SO3 / other filters) + # + #modules/attitude_estimator_ekf + modules/ekf_att_pos_estimator + modules/attitude_estimator_q + modules/position_estimator_inav - # - # Estimation modules (EKF/ SO3 / other filters) - # - #modules/attitude_estimator_ekf - modules/ekf_att_pos_estimator - modules/attitude_estimator_q - modules/position_estimator_inav + # + # Vehicle Control + # + modules/mc_att_control + modules/mc_pos_control - # - # Vehicle Control - # - modules/mc_att_control - modules/mc_pos_control + # + # Library modules + # + modules/systemlib + modules/systemlib/mixer + modules/uORB + modules/commander - # - # Library modules - # - modules/systemlib - modules/systemlib/mixer - modules/uORB - modules/commander + # + # Libraries + # + lib/mathlib + lib/mathlib/math/filter + lib/geo + lib/geo_lookup + lib/conversion + modules/controllib - # - # Libraries - # - lib/mathlib - lib/mathlib/math/filter - lib/geo - lib/geo_lookup - lib/conversion - modules/controllib + # + # QuRT port + # + platforms/common + platforms/qurt/px4_layer + platforms/posix/work_queue - # - # QuRT port - # - platforms/common - platforms/qurt/px4_layer - platforms/posix/work_queue - - # - # sources for muorb over fastrpc - # - modules/muorb/adsp - ) - set(${OUT_MODULES} ${config_module_list} PARENT_SCOPE) - -endfunction() + # + # sources for muorb over fastrpc + # + modules/muorb/adsp + )