Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bundle and ensure the exportation of rosidl generated targets #601

Merged
merged 3 commits into from
Jun 30, 2021
Merged

Bundle and ensure the exportation of rosidl generated targets #601

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
089420b
Bundle and ensure the exportation of rosidl generated targets
hidmic Jun 24, 2021
ff6e53f
Target rosidl_typesupport_introspection_cpp dependencies explicitly
hidmic Jun 24, 2021
a10f1c8
Address peer review comments
hidmic Jun 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions rosidl_cmake/cmake/rosidl_generate_interfaces.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ macro(rosidl_generate_interfaces target)
)

if(NOT _ARG_SKIP_INSTALL)
_ament_cmake_export_targets_register_package_hook()
ivanpauno marked this conversation as resolved.
Show resolved Hide resolved
if(NOT _ARG_SKIP_GROUP_MEMBERSHIP_CHECK)
set(_group_name "rosidl_interface_packages")
if(NOT _AMENT_PACKAGE_NAME)
Expand Down Expand Up @@ -301,6 +302,7 @@ macro(rosidl_generate_interfaces target)
endif()

if(NOT _ARG_SKIP_INSTALL)
ament_export_targets(${rosidl_generate_interfaces_TARGET})
foreach(_idl_tuple ${_idl_tuples})
string(REGEX REPLACE ":([^:]*)$" ";\\1" _idl_list "${_idl_tuple}")
list(GET _idl_list 1 _idl_relpath)
Expand Down
3 changes: 1 addition & 2 deletions rosidl_generator_c/cmake/rosidl_generator_c_generate_interfaces.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,9 @@ if(NOT rosidl_generate_interfaces_SKIP_INSTALL)
)
endif()
ament_export_libraries(${rosidl_generate_interfaces_TARGET}${_target_suffix})
ament_export_targets(${rosidl_generate_interfaces_TARGET}${_target_suffix})
install(
TARGETS ${rosidl_generate_interfaces_TARGET}${_target_suffix}
EXPORT ${rosidl_generate_interfaces_TARGET}${_target_suffix}
EXPORT ${rosidl_generate_interfaces_TARGET}
ivanpauno marked this conversation as resolved.
Show resolved Hide resolved
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
RUNTIME DESTINATION bin
Expand Down
3 changes: 1 addition & 2 deletions rosidl_generator_cpp/cmake/rosidl_generator_cpp_generate_interfaces.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,8 @@ if(NOT rosidl_generate_interfaces_SKIP_INSTALL)

install(
TARGETS ${rosidl_generate_interfaces_TARGET}${_target_suffix}
EXPORT ${rosidl_generate_interfaces_TARGET}${_target_suffix}
EXPORT ${rosidl_generate_interfaces_TARGET}
)
ament_export_targets(${rosidl_generate_interfaces_TARGET}${_target_suffix})
endif()

if(BUILD_TESTING AND rosidl_generate_interfaces_ADD_LINTER_TESTS)
Expand Down
3 changes: 1 addition & 2 deletions ...upport_introspection_c/cmake/rosidl_typesupport_introspection_c_generate_interfaces.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,14 +142,13 @@ if(NOT rosidl_generate_interfaces_SKIP_INSTALL)
endif()
install(
TARGETS ${rosidl_generate_interfaces_TARGET}${_target_suffix}
EXPORT ${rosidl_generate_interfaces_TARGET}${_target_suffix}
EXPORT ${rosidl_generate_interfaces_TARGET}
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
RUNTIME DESTINATION bin
)
rosidl_export_typesupport_targets(${_target_suffix}
${rosidl_generate_interfaces_TARGET}${_target_suffix})
ament_export_targets(${rosidl_generate_interfaces_TARGET}${_target_suffix})
endif()

if(BUILD_TESTING AND rosidl_generate_interfaces_ADD_LINTER_TESTS)
Expand Down
10 changes: 4 additions & 6 deletions ...rt_introspection_cpp/cmake/rosidl_typesupport_introspection_cpp_generate_interfaces.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,9 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
COMPILE_OPTIONS -Wall -Wextra -Wpedantic
)
endif()
target_include_directories(${rosidl_generate_interfaces_TARGET}${_target_suffix}
PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/rosidl_generator_cpp>"
)
target_link_libraries(
${rosidl_generate_interfaces_TARGET}${_target_suffix}
${rosidl_generate_interfaces_TARGET}__rosidl_generator_cpp)
ament_target_dependencies(${rosidl_generate_interfaces_TARGET}${_target_suffix}
"rosidl_runtime_c"
"rosidl_typesupport_interface"
Expand Down Expand Up @@ -135,14 +134,13 @@ if(NOT rosidl_generate_interfaces_SKIP_INSTALL)
endif()
install(
TARGETS ${rosidl_generate_interfaces_TARGET}${_target_suffix}
EXPORT ${rosidl_generate_interfaces_TARGET}${_target_suffix}
EXPORT ${rosidl_generate_interfaces_TARGET}
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
RUNTIME DESTINATION bin
)
rosidl_export_typesupport_targets(${_target_suffix}
${rosidl_generate_interfaces_TARGET}${_target_suffix})
ament_export_targets(${rosidl_generate_interfaces_TARGET}${_target_suffix})
endif()

if(BUILD_TESTING AND rosidl_generate_interfaces_ADD_LINTER_TESTS)
Expand Down