Skip to content

Commit da29cb0

Browse files
authored
Fix build export dependencies in C introspection package (#695)
The generated code depends on headers from rosidl_runtime_c and rosidl_typesupport_interface. Add appropriate build export logic to the CMake code and package.xml. Removed an obsolete comment from the CMakeLists.txt. Signed-off-by: Jacob Perron <[email protected]>
1 parent 5181196 commit da29cb0

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

rosidl_typesupport_introspection_c/CMakeLists.txt

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ find_package(ament_cmake_ros REQUIRED)
1616

1717
ament_export_dependencies(rosidl_cmake)
1818
ament_export_dependencies(rosidl_runtime_c)
19-
# The reason the impl folder is exported is that it contains the implementation
20-
# for the get_*_type_support_handle functions and defines the opensplice
21-
# specific version of these functions.
19+
ament_export_dependencies(rosidl_typesupport_interface)
2220

2321
ament_python_install_package(${PROJECT_NAME})
2422

rosidl_typesupport_introspection_c/cmake/rosidl_typesupport_introspection_c_generate_interfaces.cmake

+6
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ if(NOT TARGET ${rosidl_generate_interfaces_TARGET}__rosidl_generator_c)
1818
"'rosidl_typesupport_introspection_c' extension.")
1919
endif()
2020

21+
find_package(rosidl_runtime_c REQUIRED)
22+
find_package(rosidl_typesupport_interface REQUIRED)
23+
find_package(rosidl_typesupport_introspection_c REQUIRED)
24+
2125
set(_output_path
2226
"${CMAKE_CURRENT_BINARY_DIR}/rosidl_typesupport_introspection_c/${PROJECT_NAME}")
2327
set(_generated_header_files "")
@@ -123,6 +127,8 @@ target_link_libraries(${rosidl_generate_interfaces_TARGET}${_target_suffix} PUBL
123127
${rosidl_generate_interfaces_TARGET}__rosidl_generator_c)
124128

125129
target_link_libraries(${rosidl_generate_interfaces_TARGET}${_target_suffix} PUBLIC
130+
rosidl_runtime_c::rosidl_runtime_c
131+
rosidl_typesupport_interface::rosidl_typesupport_interface
126132
rosidl_typesupport_introspection_c::rosidl_typesupport_introspection_c)
127133

128134
foreach(_pkg_name ${rosidl_generate_interfaces_DEPENDENCY_PACKAGE_NAMES})

rosidl_typesupport_introspection_c/package.xml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<buildtool_export_depend>rosidl_cmake</buildtool_export_depend>
2020

2121
<build_export_depend>rosidl_runtime_c</build_export_depend>
22+
<build_export_depend>rosidl_typesupport_interface</build_export_depend>
2223

2324
<exec_depend>ament_index_python</exec_depend>
2425
<exec_depend>rosidl_cli</exec_depend>

0 commit comments

Comments
 (0)