Merge pull request #2974 from mcharleb/param-cmake-fixes

Param cmake fixes
This commit is contained in:
Lorenz Meier
2015-10-12 08:57:27 +02:00
19 changed files with 292 additions and 207 deletions
+3 -1
View File
@@ -731,7 +731,9 @@ function(px4_generate_parameters_xml)
REQUIRED OUT BOARD
ARGN ${ARGN})
set(path ${CMAKE_SOURCE_DIR}/src)
file(GLOB_RECURSE param_src_files ${path}/*.h* ${path}/*.c*)
file(GLOB_RECURSE param_src_files
${CMAKE_SOURCE_DIR}/src/*params.c
)
add_custom_command(OUTPUT ${OUT}
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/Tools/px_process_params.py
-s ${path} --board CONFIG_ARCH_${BOARD} --xml
+1 -1
View File
@@ -229,7 +229,7 @@ function(px4_os_prebuild_targets)
COMMAND patch -p1 -i ${CMAKE_SOURCE_DIR}/cmake/qurt/qurt_eigen.patch
DEPENDS git_eigen)
add_custom_target(${OUT} DEPENDS git_dspal git_eigen_patched)
add_custom_target(ALL DEPENDS git_eigen)
add_custom_target(ALL DEPENDS git_eigen_patched)
endfunction()
-2
View File
@@ -46,5 +46,3 @@
# The macros are called from the top level CMakeLists.txt
#
px4_add_git_submodule(TARGET git_dspal PATH "src/lib/dspal")
px4_add_git_submodule(TARGET git_eigen32 PATH "src/lib/eigen-3.2")