Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-27 18:27:05 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

uxrce_dds_client: remove unused msgdir arg from script

Browse Source
This commit is contained in:
GuillaumeLaine
2024-11-20 08:24:58 +01:00
committed by Beat Küng
parent 58e5b75d06
commit 4d62522942
3 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
msg/CMakeLists.txt
+1 -7
View File
@@ -448,13 +448,7 @@ if(CONFIG_LIB_CDRSTREAM)
# Copy .msg files # Copy .msg files
foreach(msg_file ${msg_files}) foreach(msg_file ${msg_files})
get_filename_component(msg ${msg_file} NAME_WE) get_filename_component(msg ${msg_file} NAME_WE)
get_filename_component(msg_directory ${msg_file} DIRECTORY) configure_file(${msg_file} ${idl_out_path}/${msg}.msg COPYONLY)
get_filename_component(msg_directory ${msg_directory} NAME)
if(msg_directory STREQUAL "versioned")
configure_file(${PX4_SOURCE_DIR}/msg/${msg_directory}/${msg}.msg ${idl_out_path}/${msg}.msg COPYONLY)
else()
configure_file(${PX4_SOURCE_DIR}/msg/${msg}.msg ${idl_out_path}/${msg}.msg COPYONLY)
endif()
list(APPEND uorb_cdr_idl ${idl_out_path}/${msg}.idl) list(APPEND uorb_cdr_idl ${idl_out_path}/${msg}.idl)
list(APPEND uorb_cdr_msg ${idl_out_path}/${msg}.msg) list(APPEND uorb_cdr_msg ${idl_out_path}/${msg}.msg)
list(APPEND uorb_cdr_idl_uorb ${idl_uorb_path}/${msg}.h) list(APPEND uorb_cdr_idl_uorb ${idl_uorb_path}/${msg}.h)
src/modules/uxrce_dds_client/CMakeLists.txt
-1
View File
@@ -117,7 +117,6 @@ else()
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dds_topics.h add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dds_topics.h
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/generate_dds_topics.py COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/generate_dds_topics.py
--topic-msg-dir ${PX4_SOURCE_DIR}/msg
--client-outdir ${CMAKE_CURRENT_BINARY_DIR} --client-outdir ${CMAKE_CURRENT_BINARY_DIR}
--dds-topics-file ${CMAKE_CURRENT_SOURCE_DIR}/dds_topics.yaml --dds-topics-file ${CMAKE_CURRENT_SOURCE_DIR}/dds_topics.yaml
--template_file ${CMAKE_CURRENT_SOURCE_DIR}/dds_topics.h.em --template_file ${CMAKE_CURRENT_SOURCE_DIR}/dds_topics.h.em
src/modules/uxrce_dds_client/generate_dds_topics.py
-3
View File
@@ -43,9 +43,6 @@ import em
import yaml import yaml
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument("-m", "--topic-msg-dir", dest='msgdir', type=str,
help="Topics message, by default using relative path 'msg/'", default="msg")
parser.add_argument("-y", "--dds-topics-file", dest='yaml_file', type=str, parser.add_argument("-y", "--dds-topics-file", dest='yaml_file', type=str,
help="Setup topics file path, by default using 'dds_topics.yaml'") help="Setup topics file path, by default using 'dds_topics.yaml'")