fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-15 09:13:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

FlightTasks: set variable for python args

Browse Source
This commit is contained in:
ChristophTobler
2018-08-08 13:44:49 +02:00
committed by Dennis Mannhart
parent 4bbde0df8c
commit 89cc53755c
1 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/FlightTasks/CMakeLists.txt
+22 -28
View File
@@ -51,37 +51,31 @@ set(files_to_generate
)
# generate files needed for Flight Tasks
if(${flight_tasks_additional}) # TODO look for nicer solution
add_custom_command(
OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/FlightTasks_generated.hpp
${CMAKE_CURRENT_BINARY_DIR}/FlightTasks_generated.cpp
COMMAND ${PYTHON_EXECUTABLE} generate_flight_tasks.py
-t ${flight_tasks_all}
-s ${flight_tasks_additional}
-i ${CMAKE_CURRENT_SOURCE_DIR}/Templates
-o ${CMAKE_CURRENT_BINARY_DIR}
-f ${files_to_generate}
COMMENT "Generating Flight Tasks"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
VERBATIM
)
else()
add_custom_command(
OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/FlightTasks_generated.hpp
${CMAKE_CURRENT_BINARY_DIR}/FlightTasks_generated.cpp
COMMAND ${PYTHON_EXECUTABLE} generate_flight_tasks.py
-t ${flight_tasks_all}
-i ${CMAKE_CURRENT_SOURCE_DIR}/Templates
-o ${CMAKE_CURRENT_BINARY_DIR}
-f ${files_to_generate}
COMMENT "Generating Flight Tasks"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
VERBATIM
set(python_args
-t ${flight_tasks_all}
-i ${CMAKE_CURRENT_SOURCE_DIR}/Templates
-o ${CMAKE_CURRENT_BINARY_DIR}
-f ${files_to_generate}
)
if(${flight_tasks_additional})
list(APPEND python_args
-s ${flight_tasks_additional}
)
endif()
add_custom_command(
OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/FlightTasks_generated.hpp
${CMAKE_CURRENT_BINARY_DIR}/FlightTasks_generated.cpp
COMMAND ${PYTHON_EXECUTABLE} generate_flight_tasks.py
${python_args}
COMMENT "Generating Flight Tasks"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
VERBATIM
)
# add the Flight Tasks library
px4_add_library(FlightTasks
FlightTasks.cpp