Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Replace rosidl_generator_x for rosidl_runtime_x #399

Merged
ahcorde merged 5 commits into from
Apr 10, 2020
Merged

Replace rosidl_generator_x for rosidl_runtime_x #399

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1053a0b
Replace rosidl_generator_x for rosidl_runtime_x
ahcorde Mar 23, 2020
84893bc
Replaced rosidl_generator_cpp to rosidl_runtime_cpp in rmw_connext_cpp
ahcorde Mar 24, 2020
539cd1c
Merge remote-tracking branch 'origin/master' into ahcorde/rosidl_runtime
ahcorde Apr 3, 2020
e3efbd9
keep the originally used dependency type
ahcorde Apr 7, 2020
8e2ba26
Merge remote-tracking branch 'origin/master' into ahcorde/rosidl_runtime
ahcorde Apr 9, 2020
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
12 changes: 6 additions & 6 deletions rmw_connext_cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ endif()

find_package(rmw REQUIRED)
find_package(rmw_connext_shared_cpp REQUIRED)
find_package(rosidl_generator_c REQUIRED)
find_package(rosidl_generator_cpp REQUIRED)
find_package(rosidl_runtime_c REQUIRED)
find_package(rosidl_runtime_cpp REQUIRED)

include_directories(include)

Expand All @@ -59,8 +59,8 @@ ament_export_dependencies(
rcutils
rmw
rmw_connext_shared_cpp
rosidl_generator_c
rosidl_generator_cpp
rosidl_runtime_c
rosidl_runtime_cpp
rosidl_typesupport_connext_c
rosidl_typesupport_connext_cpp)

Expand Down Expand Up @@ -186,8 +186,8 @@ ament_target_dependencies(rmw_connext_cpp
"rcutils"
"rmw"
"rmw_connext_shared_cpp"
"rosidl_generator_c"
"rosidl_generator_cpp"
"rosidl_runtime_c"
"rosidl_runtime_cpp"
"rosidl_typesupport_connext_c"
"rosidl_typesupport_connext_cpp"
"Connext")
Expand Down
8 changes: 4 additions & 4 deletions rmw_connext_cpp/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,14 @@
<build_depend>rcutils</build_depend>
<build_depend>rmw</build_depend>
<build_depend>rmw_connext_shared_cpp</build_depend>
<build_depend>rosidl_generator_c</build_depend>
<build_depend>rosidl_generator_cpp</build_depend>
<build_depend>rosidl_runtime_cpp</build_depend>
<build_depend>rosidl_generator_dds_idl</build_depend>
<build_depend>rosidl_typesupport_connext_c</build_depend>
<build_depend>rosidl_typesupport_connext_cpp</build_depend>
<build_depend>rti-connext-dds-5.3.1</build_depend>

<build_export_depend>connext_cmake_module</build_export_depend>
<build_export_depend>rosidl_generator_c</build_export_depend>
<build_export_depend>rosidl_generator_cpp</build_export_depend>
<build_export_depend>rosidl_runtime_cpp</build_export_depend>
<build_export_depend>rosidl_typesupport_connext_c</build_export_depend>
<build_export_depend>rosidl_typesupport_connext_cpp</build_export_depend>
<build_export_depend>rti-connext-dds-5.3.1</build_export_depend>
Expand All @@ -35,6 +33,8 @@
<exec_depend>rmw</exec_depend>
<exec_depend>rmw_connext_shared_cpp</exec_depend>

<depend>rosidl_runtime_c</depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>

Expand Down
12 changes: 6 additions & 6 deletions rmw_connext_dynamic_cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ endif()

find_package(rmw REQUIRED)
find_package(rmw_connext_shared_cpp REQUIRED)
find_package(rosidl_generator_c REQUIRED)
find_package(rosidl_generator_cpp REQUIRED)
find_package(rosidl_runtime_c REQUIRED)
find_package(rosidl_runtime_cpp REQUIRED)

ament_export_dependencies(
rcutils
rmw rmw_connext_shared_cpp
rosidl_generator_c
rosidl_generator_cpp
rosidl_runtime_c
rosidl_runtime_cpp
rosidl_typesupport_introspection_c
rosidl_typesupport_introspection_cpp
)
Expand All @@ -67,8 +67,8 @@ ament_target_dependencies(rmw_connext_dynamic_cpp
"rosidl_typesupport_introspection_cpp"
"rmw"
"rmw_connext_shared_cpp"
"rosidl_generator_c"
"rosidl_generator_cpp"
"rosidl_runtime_c"
"rosidl_runtime_cpp"
"Connext")
if(Connext_GLIBCXX_USE_CXX11_ABI_ZERO)
target_compile_definitions(rmw_connext_dynamic_cpp
Expand Down
8 changes: 4 additions & 4 deletions rmw_connext_dynamic_cpp/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,13 @@
<build_depend>rcutils</build_depend>
<build_depend>rmw</build_depend>
<build_depend>rmw_connext_shared_cpp</build_depend>
<build_depend>rosidl_generator_c</build_depend>
<build_depend>rosidl_generator_cpp</build_depend>
<build_depend>rosidl_runtime_cpp</build_depend>
<build_depend>rosidl_typesupport_introspection_c</build_depend>
<build_depend>rosidl_typesupport_introspection_cpp</build_depend>
<build_depend>rti-connext-dds-5.3.1</build_depend>

<build_export_depend>connext_cmake_module</build_export_depend>
<build_export_depend>rosidl_generator_c</build_export_depend>
<build_export_depend>rosidl_generator_cpp</build_export_depend>
<build_export_depend>rosidl_runtime_cpp</build_export_depend>
<build_export_depend>rosidl_typesupport_introspection_c</build_export_depend>
<build_export_depend>rosidl_typesupport_introspection_cpp</build_export_depend>
<build_export_depend>rti-connext-dds-5.3.1</build_export_depend>
Expand All @@ -30,6 +28,8 @@
<exec_depend>rmw</exec_depend>
<exec_depend>rmw_connext_shared_cpp</exec_depend>

<depend>rosidl_runtime_c</depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>

Expand Down