dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

micrortps_bridge: don't reuse msg_files variable (now global)

This commit is contained in:
Daniel Agar 2020-10-19 13:29:46 -04:00
parent 1eb3c59277
commit 2201424dfd
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/modules/micrortps_bridge/CMakeLists.txt
View File

@ -129,36 +129,40 @@ if (GENERATE_RTPS_BRIDGE)
# Generate uORB serialization headers # Generate uORB serialization headers
add_custom_command(OUTPUT ${uorb_headers_microcdr} add_custom_command(OUTPUT ${uorb_headers_microcdr}
COMMAND ${PYTHON_EXECUTABLE} tools/px_generate_uorb_topic_files.py COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/msg/tools/px_generate_uorb_topic_files.py
--headers --headers
-f ${send_topic_files} ${receive_topic_files} -f ${send_topic_files} ${receive_topic_files}
-i . -i ${PX4_SOURCE_DIR}/msg/
-o ${msg_out_path_microcdr} -o ${msg_out_path_microcdr}
-e templates/uorb_microcdr -e ${PX4_SOURCE_DIR}/msg/templates/uorb_microcdr
-t ${CMAKE_CURRENT_BINARY_DIR}/tmp/headers_microcdr -t ${CMAKE_CURRENT_BINARY_DIR}/tmp/headers_microcdr
-q -q
DEPENDS ${msg_files} DEPENDS
${receive_topic_files}
${send_topic_files}
${PX4_SOURCE_DIR}/msg/tools/px_generate_uorb_topic_files.py
COMMENT "Generating uORB microcdr topic headers" COMMENT "Generating uORB microcdr topic headers"
WORKING_DIRECTORY ${PX4_SOURCE_DIR}/msg/
VERBATIM VERBATIM
) )
add_custom_target(uorb_headers_microcdr_gen DEPENDS ${uorb_headers_microcdr}) add_custom_target(uorb_headers_microcdr_gen DEPENDS ${uorb_headers_microcdr})
# Generate uORB serialization sources # Generate uORB serialization sources
add_custom_command(OUTPUT ${uorb_sources_microcdr} add_custom_command(OUTPUT ${uorb_sources_microcdr}
COMMAND ${PYTHON_EXECUTABLE} tools/px_generate_uorb_topic_files.py COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/msg/tools/px_generate_uorb_topic_files.py
--sources --sources
-f ${send_topic_files} ${receive_topic_files} -f ${send_topic_files} ${receive_topic_files}
-i . -i ${PX4_SOURCE_DIR}/msg/
-o ${msg_source_out_path_microcdr} -o ${msg_source_out_path_microcdr}
-e templates/uorb_microcdr -e ${PX4_SOURCE_DIR}/msg/templates/uorb_microcdr
-t ${CMAKE_CURRENT_BINARY_DIR}/tmp/sources_microcdr -t ${CMAKE_CURRENT_BINARY_DIR}/tmp/sources_microcdr
-q -q
DEPENDS ${msg_files} DEPENDS
${receive_topic_files}
${send_topic_files}
${PX4_SOURCE_DIR}/msg/tools/px_generate_uorb_topic_files.py
COMMENT "Generating uORB microcdr topic sources" COMMENT "Generating uORB microcdr topic sources"
WORKING_DIRECTORY ${PX4_SOURCE_DIR}/msg/
VERBATIM VERBATIM
) )
px4_add_library(uorb_msgs_microcdr ${uorb_sources_microcdr}) px4_add_library(uorb_msgs_microcdr ${uorb_sources_microcdr})
add_dependencies(uorb_msgs_microcdr add_dependencies(uorb_msgs_microcdr
uorb_headers_microcdr_gen uorb_headers_microcdr_gen