Merge pull request #45 from mcharleb/cmake-config-fixes

cmake: converted config files to new style
This commit is contained in:
James Goppert
2015-09-11 01:46:01 -04:00
10 changed files with 324 additions and 426 deletions

View File

@@ -1,56 +1,44 @@
include(posix/px4_impl_posix) 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( systemcmds/param
NAME px4_set_config_modules systemcmds/mixer
ONE_VALUE OUT_MODULES systemcmds/ver
REQUIRED OUT_MODULES
ARGN ${ARGN})
set(config_module_list modules/mavlink
drivers/device
drivers/blinkm
drivers/pwm_out_sim
drivers/rgbled
drivers/led
modules/sensors
systemcmds/param modules/attitude_estimator_ekf
systemcmds/mixer modules/ekf_att_pos_estimator
systemcmds/ver
modules/mavlink modules/mc_pos_control
modules/mc_att_control
modules/attitude_estimator_ekf modules/systemlib
modules/ekf_att_pos_estimator modules/systemlib/mixer
modules/uORB
modules/sensors
modules/dataman
modules/sdlog2
modules/simulator
modules/commander
modules/controllib
modules/mc_pos_control lib/mathlib
modules/mc_att_control lib/mathlib/math/filter
lib/geo
lib/geo_lookup
lib/conversion
modules/systemlib platforms/posix/px4_layer
modules/systemlib/mixer platforms/posix/work_queue
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()

View File

@@ -1,45 +1,33 @@
include(posix/px4_impl_posix) 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( systemcmds/param
NAME px4_set_config_modules systemcmds/ver
ONE_VALUE OUT_MODULES
REQUIRED OUT_MODULES
ARGN ${ARGN})
set(config_module_list modules/mavlink
drivers/device
drivers/boards/sitl
drivers/led
systemcmds/param modules/systemlib
systemcmds/ver 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 platforms/posix/px4_layer
modules/uORB platforms/posix/work_queue
modules/sensors modules/muorb/krait
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()

View File

@@ -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( modules/uORB
NAME px4_set_config_modules
ONE_VALUE OUT_MODULES
REQUIRED OUT_MODULES
ARGN ${ARGN})
set(config_module_list platforms/posix/px4_layer
drivers/device platforms/posix/work_queue
modules/uORB modules/muorb/krait
)
platforms/posix/px4_layer
platforms/posix/work_queue
modules/muorb/krait
)
set(${OUT_MODULES} ${config_module_list} PARENT_SCOPE)
endfunction()

View File

@@ -1,39 +1,28 @@
include(posix/px4_impl_posix) 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( systemcmds/param
NAME px4_set_config_modules systemcmds/ver
ONE_VALUE OUT_MODULES
ARGN ${ARGN})
set(config_module_list modules/mavlink
drivers/device
systemcmds/param modules/systemlib
systemcmds/ver modules/uORB
modules/dataman
modules/mavlink lib/mathlib
lib/mathlib/math/filter
lib/geo
lib/geo_lookup
lib/conversion
modules/systemlib platforms/posix/px4_layer
modules/uORB platforms/posix/work_queue
modules/dataman
lib/mathlib modules/muorb/krait
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()

View File

@@ -1,35 +1,29 @@
include(qurt/px4_impl_qurt) include(qurt/px4_impl_qurt)
function(px4_get_config) set(CMAKE_TOOLCHAIN_FILE cmake/toolchains/Toolchain-hexagon.cmake)
px4_parse_function_args( set(config_module_list
NAME px4_set_config_modules drivers/device
ONE_VALUE OUT_MODULES
REQUIRED OUT_MODULES
ARGN ${ARGN})
set(config_module_list #
drivers/device # System commands
#
systemcmds/param
# #
# System commands # Library modules
# #
systemcmds/param modules/systemlib
modules/uORB
# #
# Library modules # QuRT port
# #
modules/systemlib platforms/common
modules/uORB 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) set(${out_module_list} ${config_module_list} PARENT_SCOPE)
# output # output

View File

@@ -1,75 +1,62 @@
include(qurt/px4_impl_qurt) 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 # System commands
ONE_VALUE OUT_MODULES #
REQUIRED OUT_MODULES systemcmds/param
ARGN ${ARGN}) systemcmds/mixer
set(config_module_list #
drivers/device # Estimation modules (EKF/ SO3 / other filters)
drivers/boards/sitl #
drivers/pwm_out_sim #modules/attitude_estimator_ekf
drivers/led modules/ekf_att_pos_estimator
drivers/rgbled modules/attitude_estimator_q
modules/sensors modules/position_estimator_inav
# #
# System commands # Vehicle Control
# #
systemcmds/param modules/mc_att_control
systemcmds/mixer modules/mc_pos_control
# #
# Estimation modules (EKF/ SO3 / other filters) # Library modules
# #
#modules/attitude_estimator_ekf modules/systemlib
modules/ekf_att_pos_estimator modules/systemlib/mixer
modules/attitude_estimator_q modules/uORB
modules/position_estimator_inav modules/commander
# #
# Vehicle Control # Libraries
# #
modules/mc_att_control lib/mathlib
modules/mc_pos_control lib/mathlib/math/filter
lib/geo
lib/geo_lookup
lib/conversion
modules/controllib
# #
# Library modules # QuRT port
# #
modules/systemlib platforms/common
modules/systemlib/mixer platforms/qurt/px4_layer
modules/uORB platforms/posix/work_queue
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()
#
# sources for muorb over fastrpc
#
modules/muorb/adsp
)

View File

@@ -1,50 +1,40 @@
include(qurt/px4_impl_qurt) include(qurt/px4_impl_qurt)
function(px4_get_config) set(CMAKE_TOOLCHAIN_FILE cmake/toolchains/Toolchain-hexagon.cmake)
px4_parse_function_args( set(config_module_list
NAME px4_set_config_modules drivers/device
ONE_VALUE OUT_MODULES
REQUIRED
ARGN ${ARGN})
set(config_module_list #
drivers/device # System commands
#
systemcmds/param
# #
# System commands # Library modules
# #
systemcmds/param modules/systemlib
modules/uORB
# #
# Library modules # Libraries
# #
modules/systemlib lib/mathlib
modules/uORB lib/mathlib/math/filter
lib/geo
lib/geo_lookup
lib/conversion
# #
# Libraries # QuRT port
# #
lib/mathlib platforms/common
lib/mathlib/math/filter platforms/qurt/px4_layer
lib/geo platforms/posix/work_queue
lib/geo_lookup platforms/qurt/tests/muorb
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()
#
# sources for muorb over fastrpc
#
modules/muorb/adsp
)

View File

@@ -19,74 +19,66 @@ set(target_libraries
rc_receiver rc_receiver
) )
function(px4_get_config)
px4_parse_function_args( set(CMAKE_TOOLCHAIN_FILE cmake/toolchains/Toolchain-hexagon.cmake)
NAME px4_set_config_modules
ONE_VALUE OUT_MODULES
REQUIRED OUT_MODULES
ARGN ${ARGN})
set(config_module_list set(config_module_list
# #
# Board support modules # Board support modules
# #
drivers/device drivers/device
modules/sensors modules/sensors
$(EAGLE_DRIVERS_SRC)/mpu9x50 $(EAGLE_DRIVERS_SRC)/mpu9x50
$(EAGLE_DRIVERS_SRC)/uart_esc $(EAGLE_DRIVERS_SRC)/uart_esc
$(EAGLE_DRIVERS_SRC)/rc_receiver $(EAGLE_DRIVERS_SRC)/rc_receiver
$(EAGLE_DRIVERS_SRC)/csr_gps $(EAGLE_DRIVERS_SRC)/csr_gps
# #
# System commands # System commands
# #
systemcmds/param systemcmds/param
# #
# Estimation modules (EKF/ SO3 / other filters) # Estimation modules (EKF/ SO3 / other filters)
# #
#modules/attitude_estimator_ekf #modules/attitude_estimator_ekf
modules/ekf_att_pos_estimator modules/ekf_att_pos_estimator
modules/attitude_estimator_q modules/attitude_estimator_q
modules/position_estimator_inav modules/position_estimator_inav
# #
# Vehicle Control # Vehicle Control
# #
modules/mc_att_control modules/mc_att_control
modules/mc_pos_control modules/mc_pos_control
# #
# Library modules # Library modules
# #
modules/systemlib modules/systemlib
modules/systemlib/mixer modules/systemlib/mixer
modules/uORB modules/uORB
modules/commander modules/commander
modules/controllib modules/controllib
# #
# Libraries # Libraries
# #
lib/mathlib lib/mathlib
lib/mathlib/math/filter lib/mathlib/math/filter
lib/geo lib/geo
lib/geo_lookup lib/geo_lookup
lib/conversion lib/conversion
# #
# QuRT port # QuRT port
# #
platforms/common platforms/common
platforms/qurt/px4_layer platforms/qurt/px4_layer
platforms/posix/work_queue platforms/posix/work_queue
# #
# sources for muorb over fastrpc # sources for muorb over fastrpc
# #
modules/muorb/adsp modules/muorb/adsp
) )
set(${OUT_MODULES} ${config_module_list} PARENT_SCOPE)
endfunction()

View File

@@ -1,47 +1,38 @@
include(qurt/px4_impl_qurt) include(qurt/px4_impl_qurt)
function(px4_get_config) set(CMAKE_TOOLCHAIN_FILE cmake/toolchains/Toolchain-hexagon.cmake)
px4_parse_function_args( set(config_module_list
NAME px4_set_config_modules drivers/device
ONE_VALUE OUT_MODULES
REQUIRED OUT_MODULES
ARGN ${ARGN})
set(config_module_list #
drivers/device # System commands
#
systemcmds/param
# #
# System commands # Library modules
# #
systemcmds/param modules/systemlib
modules/mixer
modules/uORB
# #
# Library modules # Libraries
# #
modules/systemlib lib/mathlib
modules/mixer lib/mathlib/math/filter
modules/uORB lib/conversion
# #
# Libraries # QuRT port
# #
lib/mathlib platforms/common
lib/mathlib/math/filter platforms/qurt/px4_layer
lib/conversion platforms/posix/work_queue
platforms/qurt/tests/hello
# platforms/qurt/tests/vcdev_test
# QuRT port platforms/qurt/tests/hrt_test
# platforms/qurt/tests/wqueue
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()

View File

@@ -3,73 +3,64 @@ include(qurt/px4_impl_qurt)
# Run a full link with build stubs to make sure qurt target isn't broken # Run a full link with build stubs to make sure qurt target isn't broken
set(QURT_ENABLE_STUBS 1) set(QURT_ENABLE_STUBS 1)
function(px4_get_config) set(CMAKE_TOOLCHAIN_FILE cmake/toolchains/Toolchain-hexagon.cmake)
px4_parse_function_args( set(config_module_list
NAME px4_set_config_modules drivers/device
ONE_VALUE OUT_MODULES drivers/boards/sitl
REQUIRED OUT_MODULES drivers/pwm_out_sim
ARGN ${ARGN}) drivers/led
drivers/rgbled
modules/sensors
set(config_module_list #
drivers/device # System commands
drivers/boards/sitl #
drivers/pwm_out_sim systemcmds/param
drivers/led systemcmds/mixer
drivers/rgbled
modules/sensors
# #
# System commands # Estimation modules (EKF/ SO3 / other filters)
# #
systemcmds/param #modules/attitude_estimator_ekf
systemcmds/mixer modules/ekf_att_pos_estimator
modules/attitude_estimator_q
modules/position_estimator_inav
# #
# Estimation modules (EKF/ SO3 / other filters) # Vehicle Control
# #
#modules/attitude_estimator_ekf modules/mc_att_control
modules/ekf_att_pos_estimator modules/mc_pos_control
modules/attitude_estimator_q
modules/position_estimator_inav
# #
# Vehicle Control # Library modules
# #
modules/mc_att_control modules/systemlib
modules/mc_pos_control modules/systemlib/mixer
modules/uORB
modules/commander
# #
# Library modules # Libraries
# #
modules/systemlib lib/mathlib
modules/systemlib/mixer lib/mathlib/math/filter
modules/uORB lib/geo
modules/commander lib/geo_lookup
lib/conversion
modules/controllib
# #
# Libraries # QuRT port
# #
lib/mathlib platforms/common
lib/mathlib/math/filter platforms/qurt/px4_layer
lib/geo platforms/posix/work_queue
lib/geo_lookup
lib/conversion
modules/controllib
# #
# QuRT port # sources for muorb over fastrpc
# #
platforms/common modules/muorb/adsp
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()