Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmake ROMFS generate add px4_add_romfs_files function #1

Merged
merged 1 commit into from
Mar 23, 2018
Merged

cmake ROMFS generate add px4_add_romfs_files function #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions ROMFS/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@

message(STATUS "ROMFS: ${config_romfs_root}")

#set(romfs_bin_dir ${PX4_BINARY_DIR}/ROMFS/${config_romfs_root})
set(romfs_temp_dir ${PX4_BINARY_DIR}/ROMFS/genromfs)
set(config_romfs_files_list)
set(romfs_src_dir ${PX4_SOURCE_DIR}/ROMFS/${config_romfs_root})
set(romfs_temp_dir ${PX4_BINARY_DIR}/genromfs)

function(px4_add_romfs_files)
foreach(arg IN LISTS ARGN)
list(APPEND config_romfs_files_list
${CMAKE_CURRENT_SOURCE_DIR}/${arg}
)
endforeach()

set(config_romfs_files_list ${config_romfs_files_list} CACHE INTERNAL "ROMFS file list")
endfunction()

# get list of all ROMFS files
add_subdirectory(${romfs_src_dir})
Expand Down
4 changes: 0 additions & 4 deletions ROMFS/px4fmu_common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,5 @@
#
############################################################################

set(config_romfs_files_list)

add_subdirectory(init.d)
add_subdirectory(mixers)

set(config_romfs_files_list ${config_romfs_files_list} PARENT_SCOPE)
172 changes: 85 additions & 87 deletions ROMFS/px4fmu_common/init.d/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,90 +31,88 @@
#
############################################################################

list(APPEND config_romfs_files_list
${CMAKE_CURRENT_LIST_DIR}/1000_rc_fw_easystar.hil
${CMAKE_CURRENT_LIST_DIR}/1001_rc_quad_x.hil
${CMAKE_CURRENT_LIST_DIR}/2100_standard_plane
${CMAKE_CURRENT_LIST_DIR}/2105_maja
${CMAKE_CURRENT_LIST_DIR}/2106_albatross
${CMAKE_CURRENT_LIST_DIR}/24001_dodeca_cox
${CMAKE_CURRENT_LIST_DIR}/3000_generic_wing
${CMAKE_CURRENT_LIST_DIR}/3030_io_camflyer
${CMAKE_CURRENT_LIST_DIR}/3031_phantom
${CMAKE_CURRENT_LIST_DIR}/3032_skywalker_x5
${CMAKE_CURRENT_LIST_DIR}/3033_wingwing
${CMAKE_CURRENT_LIST_DIR}/3034_fx79
${CMAKE_CURRENT_LIST_DIR}/3035_viper
${CMAKE_CURRENT_LIST_DIR}/3036_pigeon
${CMAKE_CURRENT_LIST_DIR}/3037_parrot_disco_mod
${CMAKE_CURRENT_LIST_DIR}/3100_tbs_caipirinha
${CMAKE_CURRENT_LIST_DIR}/4001_quad_x
${CMAKE_CURRENT_LIST_DIR}/4002_quad_x_mount
${CMAKE_CURRENT_LIST_DIR}/4003_qavr5
${CMAKE_CURRENT_LIST_DIR}/4004_H4_680mm
${CMAKE_CURRENT_LIST_DIR}/4009_qav250
${CMAKE_CURRENT_LIST_DIR}/4010_dji_f330
${CMAKE_CURRENT_LIST_DIR}/4011_dji_f450
${CMAKE_CURRENT_LIST_DIR}/4012_quad_x_can
${CMAKE_CURRENT_LIST_DIR}/4013_bebop
${CMAKE_CURRENT_LIST_DIR}/4020_hk_micro_pcb
${CMAKE_CURRENT_LIST_DIR}/4030_3dr_solo
${CMAKE_CURRENT_LIST_DIR}/4031_3dr_quad
${CMAKE_CURRENT_LIST_DIR}/4040_reaper
${CMAKE_CURRENT_LIST_DIR}/4050_generic_250
${CMAKE_CURRENT_LIST_DIR}/4051_s250aq
${CMAKE_CURRENT_LIST_DIR}/4060_dji_matrice_100
${CMAKE_CURRENT_LIST_DIR}/4070_aerofc
${CMAKE_CURRENT_LIST_DIR}/4080_zmr250
${CMAKE_CURRENT_LIST_DIR}/4090_nanomind
${CMAKE_CURRENT_LIST_DIR}/4900_crazyflie
${CMAKE_CURRENT_LIST_DIR}/5001_quad_+
${CMAKE_CURRENT_LIST_DIR}/6001_hexa_x
${CMAKE_CURRENT_LIST_DIR}/7001_hexa_+
${CMAKE_CURRENT_LIST_DIR}/8001_octo_x
${CMAKE_CURRENT_LIST_DIR}/9001_octo_+
${CMAKE_CURRENT_LIST_DIR}/10015_tbs_discovery
${CMAKE_CURRENT_LIST_DIR}/10016_3dr_iris
${CMAKE_CURRENT_LIST_DIR}/10017_steadidrone_qu4d
${CMAKE_CURRENT_LIST_DIR}/10018_tbs_endurance
${CMAKE_CURRENT_LIST_DIR}/11001_hexa_cox
${CMAKE_CURRENT_LIST_DIR}/12001_octo_cox
${CMAKE_CURRENT_LIST_DIR}/12002_steadidrone_mavrik
${CMAKE_CURRENT_LIST_DIR}/13000_generic_vtol_standard
${CMAKE_CURRENT_LIST_DIR}/13001_caipirinha_vtol
${CMAKE_CURRENT_LIST_DIR}/13002_firefly6
${CMAKE_CURRENT_LIST_DIR}/13003_quad_tailsitter
${CMAKE_CURRENT_LIST_DIR}/13004_quad+_tailsitter
${CMAKE_CURRENT_LIST_DIR}/13005_vtol_AAERT_quad
${CMAKE_CURRENT_LIST_DIR}/13006_vtol_standard_delta
${CMAKE_CURRENT_LIST_DIR}/13007_vtol_AAVVT_quad
${CMAKE_CURRENT_LIST_DIR}/13008_QuadRanger
${CMAKE_CURRENT_LIST_DIR}/13009_vtol_spt_ranger
${CMAKE_CURRENT_LIST_DIR}/13010_claire
${CMAKE_CURRENT_LIST_DIR}/13012_convergence
${CMAKE_CURRENT_LIST_DIR}/13013_deltaquad
${CMAKE_CURRENT_LIST_DIR}/14001_tri_y_yaw+
${CMAKE_CURRENT_LIST_DIR}/14002_tri_y_yaw-
${CMAKE_CURRENT_LIST_DIR}/15001_coax_heli
${CMAKE_CURRENT_LIST_DIR}/16001_helicopter
${CMAKE_CURRENT_LIST_DIR}/50000_generic_ground_vehicle
${CMAKE_CURRENT_LIST_DIR}/50001_axialracing_ax10
${CMAKE_CURRENT_LIST_DIR}/50002_traxxas_stampede_2wd
${CMAKE_CURRENT_LIST_DIR}/rc.axialracing_ax10_apps
${CMAKE_CURRENT_LIST_DIR}/rc.axialracing_ax10_defaults
${CMAKE_CURRENT_LIST_DIR}/rc.fw_apps
${CMAKE_CURRENT_LIST_DIR}/rc.fw_defaults
${CMAKE_CURRENT_LIST_DIR}/rc.interface
${CMAKE_CURRENT_LIST_DIR}/rc.io
${CMAKE_CURRENT_LIST_DIR}/rc.logging
${CMAKE_CURRENT_LIST_DIR}/rc.mc_apps
${CMAKE_CURRENT_LIST_DIR}/rc.mc_defaults
${CMAKE_CURRENT_LIST_DIR}/rcS
${CMAKE_CURRENT_LIST_DIR}/rc.sensors
${CMAKE_CURRENT_LIST_DIR}/rc.ugv_apps
${CMAKE_CURRENT_LIST_DIR}/rc.ugv_defaults
${CMAKE_CURRENT_LIST_DIR}/rc.vtol_apps
${CMAKE_CURRENT_LIST_DIR}/rc.vtol_defaults
)

set(config_romfs_files_list ${config_romfs_files_list} PARENT_SCOPE)
px4_add_romfs_files(
1000_rc_fw_easystar.hil
1001_rc_quad_x.hil
2100_standard_plane
2105_maja
2106_albatross
24001_dodeca_cox
3000_generic_wing
3030_io_camflyer
3031_phantom
3032_skywalker_x5
3033_wingwing
3034_fx79
3035_viper
3036_pigeon
3037_parrot_disco_mod
3100_tbs_caipirinha
4001_quad_x
4002_quad_x_mount
4003_qavr5
4004_H4_680mm
4009_qav250
4010_dji_f330
4011_dji_f450
4012_quad_x_can
4013_bebop
4020_hk_micro_pcb
4030_3dr_solo
4031_3dr_quad
4040_reaper
4050_generic_250
4051_s250aq
4060_dji_matrice_100
4070_aerofc
4080_zmr250
4090_nanomind
4900_crazyflie
5001_quad_+
6001_hexa_x
7001_hexa_+
8001_octo_x
9001_octo_+
10015_tbs_discovery
10016_3dr_iris
10017_steadidrone_qu4d
10018_tbs_endurance
11001_hexa_cox
12001_octo_cox
12002_steadidrone_mavrik
13000_generic_vtol_standard
13001_caipirinha_vtol
13002_firefly6
13003_quad_tailsitter
13004_quad+_tailsitter
13005_vtol_AAERT_quad
13006_vtol_standard_delta
13007_vtol_AAVVT_quad
13008_QuadRanger
13009_vtol_spt_ranger
13010_claire
13012_convergence
13013_deltaquad
14001_tri_y_yaw+
14002_tri_y_yaw-
15001_coax_heli
16001_helicopter
50000_generic_ground_vehicle
50001_axialracing_ax10
50002_traxxas_stampede_2wd
rc.axialracing_ax10_apps
rc.axialracing_ax10_defaults
rc.fw_apps
rc.fw_defaults
rc.interface
rc.io
rc.logging
rc.mc_apps
rc.mc_defaults
rcS
rc.sensors
rc.ugv_apps
rc.ugv_defaults
rc.vtol_apps
rc.vtol_defaults
)
116 changes: 57 additions & 59 deletions ROMFS/px4fmu_common/mixers/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,62 +31,60 @@
#
############################################################################

list(APPEND config_romfs_files_list
${CMAKE_CURRENT_LIST_DIR}/AAERTWF.main.mix
${CMAKE_CURRENT_LIST_DIR}/AAVVTWFF.main.mix
${CMAKE_CURRENT_LIST_DIR}/AERT.main.mix
${CMAKE_CURRENT_LIST_DIR}/AETRFG.main.mix
${CMAKE_CURRENT_LIST_DIR}/bebop.main.mix
${CMAKE_CURRENT_LIST_DIR}/blade130.main.mix
${CMAKE_CURRENT_LIST_DIR}/caipi.main.mix
${CMAKE_CURRENT_LIST_DIR}/caipirinha_vtol.main.mix
${CMAKE_CURRENT_LIST_DIR}/CCPM.main.mix
${CMAKE_CURRENT_LIST_DIR}/claire.aux.mix
${CMAKE_CURRENT_LIST_DIR}/claire.main.mix
${CMAKE_CURRENT_LIST_DIR}/coax.main.mix
${CMAKE_CURRENT_LIST_DIR}/delta.main.mix
${CMAKE_CURRENT_LIST_DIR}/deltaquad.main.mix
${CMAKE_CURRENT_LIST_DIR}/dodeca_bottom_cox.aux.mix
${CMAKE_CURRENT_LIST_DIR}/dodeca_top_cox.main.mix
${CMAKE_CURRENT_LIST_DIR}/firefly6.aux.mix
${CMAKE_CURRENT_LIST_DIR}/firefly6.main.mix
${CMAKE_CURRENT_LIST_DIR}/FMU_pass.mix
${CMAKE_CURRENT_LIST_DIR}/fw_generic_wing.main.mix
${CMAKE_CURRENT_LIST_DIR}/FX79.main.mix
${CMAKE_CURRENT_LIST_DIR}/hexa_cox.main.mix
${CMAKE_CURRENT_LIST_DIR}/hexa_+.main.mix
${CMAKE_CURRENT_LIST_DIR}/hexa_x.main.mix
${CMAKE_CURRENT_LIST_DIR}/IO_pass.main.mix
${CMAKE_CURRENT_LIST_DIR}/mount.aux.mix
${CMAKE_CURRENT_LIST_DIR}/mount_legs.aux.mix
${CMAKE_CURRENT_LIST_DIR}/ocpoc_quad_x.main.mix
${CMAKE_CURRENT_LIST_DIR}/octo_cox.main.mix
${CMAKE_CURRENT_LIST_DIR}/octo_cox_w.main.mix
${CMAKE_CURRENT_LIST_DIR}/octo_+.main.mix
${CMAKE_CURRENT_LIST_DIR}/octo_x.main.mix
${CMAKE_CURRENT_LIST_DIR}/pass.aux.mix
${CMAKE_CURRENT_LIST_DIR}/phantom.main.mix
${CMAKE_CURRENT_LIST_DIR}/quad_dc.main.mix
${CMAKE_CURRENT_LIST_DIR}/quad_h.main.mix
${CMAKE_CURRENT_LIST_DIR}/quad_+.main.mix
${CMAKE_CURRENT_LIST_DIR}/quad_s250aq.main.mix
${CMAKE_CURRENT_LIST_DIR}/quad_+_vtol.main.mix
${CMAKE_CURRENT_LIST_DIR}/quad_w.main.mix
${CMAKE_CURRENT_LIST_DIR}/quad_x_can.main.mix
${CMAKE_CURRENT_LIST_DIR}/quad_x.main.mix
${CMAKE_CURRENT_LIST_DIR}/quad_x_vtol.main.mix
${CMAKE_CURRENT_LIST_DIR}/quad_x_vtol_sim.main.mix
${CMAKE_CURRENT_LIST_DIR}/stampede.main.mix
${CMAKE_CURRENT_LIST_DIR}/tri_y_yaw-.main.mix
${CMAKE_CURRENT_LIST_DIR}/tri_y_yaw+.main.mix
${CMAKE_CURRENT_LIST_DIR}/ugv_generic.main.mix
${CMAKE_CURRENT_LIST_DIR}/Viper.main.mix
${CMAKE_CURRENT_LIST_DIR}/vtol_AAERT.aux.mix
${CMAKE_CURRENT_LIST_DIR}/vtol_AAVVT.aux.mix
${CMAKE_CURRENT_LIST_DIR}/vtol_convergence.main.mix
${CMAKE_CURRENT_LIST_DIR}/vtol_delta.aux.mix
${CMAKE_CURRENT_LIST_DIR}/wingwing.main.mix
${CMAKE_CURRENT_LIST_DIR}/zmr250.main.mix
)

set(config_romfs_files_list ${config_romfs_files_list} PARENT_SCOPE)
px4_add_romfs_files(
AAERTWF.main.mix
AAVVTWFF.main.mix
AERT.main.mix
AETRFG.main.mix
bebop.main.mix
blade130.main.mix
caipi.main.mix
caipirinha_vtol.main.mix
CCPM.main.mix
claire.aux.mix
claire.main.mix
coax.main.mix
delta.main.mix
deltaquad.main.mix
dodeca_bottom_cox.aux.mix
dodeca_top_cox.main.mix
firefly6.aux.mix
firefly6.main.mix
FMU_pass.mix
fw_generic_wing.main.mix
FX79.main.mix
hexa_cox.main.mix
hexa_+.main.mix
hexa_x.main.mix
IO_pass.main.mix
mount.aux.mix
mount_legs.aux.mix
ocpoc_quad_x.main.mix
octo_cox.main.mix
octo_cox_w.main.mix
octo_+.main.mix
octo_x.main.mix
pass.aux.mix
phantom.main.mix
quad_dc.main.mix
quad_h.main.mix
quad_+.main.mix
quad_s250aq.main.mix
quad_+_vtol.main.mix
quad_w.main.mix
quad_x_can.main.mix
quad_x.main.mix
quad_x_vtol.main.mix
quad_x_vtol_sim.main.mix
stampede.main.mix
tri_y_yaw-.main.mix
tri_y_yaw+.main.mix
ugv_generic.main.mix
Viper.main.mix
vtol_AAERT.aux.mix
vtol_AAVVT.aux.mix
vtol_convergence.main.mix
vtol_delta.aux.mix
wingwing.main.mix
zmr250.main.mix
)
4 changes: 0 additions & 4 deletions ROMFS/px4fmu_test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@
#
############################################################################

set(config_romfs_files_list)

add_subdirectory(init.d)
add_subdirectory(mixers)
add_subdirectory(unit_test_data)

set(config_romfs_files_list ${config_romfs_files_list} PARENT_SCOPE)
10 changes: 4 additions & 6 deletions ROMFS/px4fmu_test/init.d/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,8 @@
#
############################################################################

list(APPEND config_romfs_files_list
${CMAKE_CURRENT_LIST_DIR}/rcS
${CMAKE_CURRENT_LIST_DIR}/rc.sensors
${CMAKE_CURRENT_LIST_DIR}/rc.standalone
px4_add_romfs_files(
rcS
rc.sensors
rc.standalone
)

set(config_romfs_files_list ${config_romfs_files_list} PARENT_SCOPE)
16 changes: 7 additions & 9 deletions ROMFS/px4fmu_test/mixers/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,11 @@
#
############################################################################

list(APPEND config_romfs_files_list
${CMAKE_CURRENT_LIST_DIR}/complex_test.mix
${CMAKE_CURRENT_LIST_DIR}/IO_pass.mix
${CMAKE_CURRENT_LIST_DIR}/quad_test.mix
${CMAKE_CURRENT_LIST_DIR}/uuv_quad_x.mix
${CMAKE_CURRENT_LIST_DIR}/vtol1_test.mix
${CMAKE_CURRENT_LIST_DIR}/vtol2_test.mix
px4_add_romfs_files(
complex_test.mix
IO_pass.mix
quad_test.mix
uuv_quad_x.mix
vtol1_test.mix
vtol2_test.mix
)

set(config_romfs_files_list ${config_romfs_files_list} PARENT_SCOPE)
2 changes: 0 additions & 2 deletions ROMFS/px4fmu_test/unit_test_data/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,3 @@
############################################################################

add_subdirectory(mavlink_tests)

set(config_romfs_files_list ${config_romfs_files_list} PARENT_SCOPE)
10 changes: 4 additions & 6 deletions ROMFS/px4fmu_test/unit_test_data/mavlink_tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,8 @@
#
############################################################################

list(APPEND config_romfs_files_list
${CMAKE_CURRENT_LIST_DIR}/test_238.data
${CMAKE_CURRENT_LIST_DIR}/test_239.data
${CMAKE_CURRENT_LIST_DIR}/test_240.data
px4_add_romfs_files(
test_238.data
test_239.data
test_240.data
)

set(config_romfs_files_list ${config_romfs_files_list} PARENT_SCOPE)
Loading