param gen reorganize and fix DISABLE_PARAMS_MODULE_SCOPING

This commit is contained in:
Daniel Agar
2017-06-05 15:24:10 -04:00
parent 9b5de23553
commit f26cd01d16
51 changed files with 184 additions and 259 deletions

View File

@@ -99,7 +99,7 @@
#
#=============================================================================
if ("${CMAKE_VERSION}" VERSION_LESS 3.1.0)
if (${CMAKE_VERSION} VERSION_LESS 3.1.0)
message("Not a valid CMake version")
message("On Ubuntu >= 16.04, install or upgrade via:")
message(" sudo apt-get install cmake")
@@ -158,7 +158,7 @@ if (NOT CMAKE_BUILD_TYPE)
if (${OS} STREQUAL "nuttx")
set(PX4_BUILD_TYPE "MinSizeRel")
elseif (${OS} STREQUAL "qurt")
set(PX4_BUILD_TYPE "MinSizeRel")
set(PX4_BUILD_TYPE "Debug")
elseif (${OS} STREQUAL "bebop")
set(PX4_BUILD_TYPE "MinSizeRel")
else()
@@ -371,7 +371,7 @@ link_directories(${link_dirs})
add_definitions(${definitions})
#=============================================================================
# message, parameter, and airframe generation
# message, and airframe generation
#
include(common/px4_metadata)
@@ -384,13 +384,7 @@ px4_generate_messages(TARGET msg_gen
DEPENDS git_genmsg git_gencpp prebuild_targets
)
px4_generate_parameters_xml(OUT parameters.xml
BOARD ${BOARD}
MODULES ${config_module_list}
OVERRIDES ${PARAM_DEFAULT_OVERRIDES})
px4_generate_airframes_xml(OUT airframes.xml BOARD ${BOARD})
add_custom_target(xml_gen DEPENDS parameters.xml airframes.xml)
px4_generate_airframes_xml(BOARD ${BOARD})
#=============================================================================
# DriverFramework