Remove messages for gui

Signed-off-by: Michael Carroll <[email protected]>
gazebosim · Jul 28, 2023 · bee19a4 · bee19a4
1 parent 4c8ffbf
commit bee19a4
Show file tree

Hide file tree

Showing 54 changed files with 17 additions and 2,983 deletions.
diff --git a/cmake/gz_msgs_generate.cmake b/cmake/gz_msgs_generate.cmake
@@ -113,9 +113,17 @@ function(gz_msgs_generate_messages_impl)
  list(APPEND ARGS -I${generate_messages_PROTO_PATH})
  list(APPEND ARGS --descriptor_set_out="${generate_messages_TARGET}.gz_desc")
 
- foreach(dep ${generate_messages_DEPENDENCIES})
- list(APPEND ARGS --descriptor_set_in="${msgs_desc_file}")
- endforeach()
+ if (generate_messages_DEPENDENCIES)
+ foreach(dep ${generate_messages_DEPENDENCIES})
+ get_target_property(msgs_desc_file ${dep} GZ_MSGS_DESC_FILE)
+ if (desc_sets)
+ set(desc_sets ${desc_sets}:${msgs_desc_file})
+ else()
+ set(desc_sets ${msgs_desc_file})
+ endif()
+ endforeach()
+ list(APPEND ARGS --descriptor_set_in="${desc_sets}")
+ endif()
 
  list(APPEND ARGS ${generate_messages_INPUT_PROTOS})
 
@@ -136,7 +144,7 @@ function(gz_msgs_generate_messages_impl)
 
  target_link_libraries(${generate_messages_TARGET} PUBLIC protobuf::libprotobuf ${generate_messages_MSGS_LIB} ${generate_messages_DEPENDENCIES})
  target_include_directories(${generate_messages_TARGET} PUBLIC
- "$<INSTALL_INTERFACE:include>"
+ "$<INSTALL_INTERFACE:${GZ_INCLUDE_INSTALL_DIR_FULL}/>"
  "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/${gen_dir}_gen>")
 
  set_property(TARGET ${generate_messages_TARGET} PROPERTY EXPORT_PROPERTIES "GZ_MSGS_DESC_FILE")

diff --git a/proto/CMakeLists.txt b/proto/CMakeLists.txt
@@ -26,11 +26,13 @@ set(proto_files
  ${PROJECT_SOURCE_DIR}/proto/gz/msgs/material.proto
  ${PROJECT_SOURCE_DIR}/proto/gz/msgs/pointcloud_packed.proto
  ${PROJECT_SOURCE_DIR}/proto/gz/msgs/pose.proto
+ ${PROJECT_SOURCE_DIR}/proto/gz/msgs/pose_v.proto
  ${PROJECT_SOURCE_DIR}/proto/gz/msgs/quaternion.proto
  ${PROJECT_SOURCE_DIR}/proto/gz/msgs/spherical_coordinates.proto
  ${PROJECT_SOURCE_DIR}/proto/gz/msgs/statistic.proto
  ${PROJECT_SOURCE_DIR}/proto/gz/msgs/stringmsg.proto
  ${PROJECT_SOURCE_DIR}/proto/gz/msgs/time.proto
+ ${PROJECT_SOURCE_DIR}/proto/gz/msgs/twist.proto
  ${PROJECT_SOURCE_DIR}/proto/gz/msgs/uint32.proto
  ${PROJECT_SOURCE_DIR}/proto/gz/msgs/uint32_v.proto
  ${PROJECT_SOURCE_DIR}/proto/gz/msgs/uint64.proto

diff --git a/proto/gz/msgs/air_pressure_sensor.proto b/proto/gz/msgs/air_pressure_sensor.proto
diff --git a/proto/gz/msgs/altimeter_sensor.proto b/proto/gz/msgs/altimeter_sensor.proto
diff --git a/proto/gz/msgs/axis.proto b/proto/gz/msgs/axis.proto
diff --git a/proto/gz/msgs/battery.proto b/proto/gz/msgs/battery.proto
diff --git a/proto/gz/msgs/boxgeom.proto b/proto/gz/msgs/boxgeom.proto