yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-21 01:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake: make sure params defined in external modules are found

Browse Source
This commit is contained in:
Beat Küng
2017-02-24 15:06:38 +01:00
committed by Lorenz Meier
parent a4fc7ae95e
commit 941d17d74c
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -154,6 +154,10 @@ set(THREADS "4" CACHE STRING "number of threads to use for external build proces
set(DEBUG_PORT "/dev/ttyACM0" CACHE STRING "debugging port") set(DEBUG_PORT "/dev/ttyACM0" CACHE STRING "debugging port")
set(EXTERNAL_MODULES_LOCATION "" CACHE STRING "External modules source location") set(EXTERNAL_MODULES_LOCATION "" CACHE STRING "External modules source location")
if(NOT EXTERNAL_MODULES_LOCATION STREQUAL "")
get_filename_component(EXTERNAL_MODULES_LOCATION "${EXTERNAL_MODULES_LOCATION}" ABSOLUTE)
endif()
#============================================================================= #=============================================================================
# configuration # configuration
# #

2
cmake/common/px4_base.cmake
View File

@@ -1041,7 +1041,7 @@ function(px4_generate_parameters_xml)
add_custom_command(OUTPUT ${OUT} add_custom_command(OUTPUT ${OUT}
COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/px_process_params.py COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/px_process_params.py
-s ${module_list} -s ${module_list} ${EXTERNAL_MODULES_LOCATION}
--board CONFIG_ARCH_${BOARD} --xml --inject-xml --board CONFIG_ARCH_${BOARD} --xml --inject-xml
--overrides ${OVERRIDES} --overrides ${OVERRIDES}
DEPENDS ${param_src_files} ${PX4_SOURCE_DIR}/Tools/px_process_params.py DEPENDS ${param_src_files} ${PX4_SOURCE_DIR}/Tools/px_process_params.py