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

added rosidl_runtime c and cpp depencencies #310

Merged
merged 11 commits into from
Apr 10, 2020
Merged

added rosidl_runtime c and cpp depencencies #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a2d0758
added rosidl_runtime c and cpp depencencies
ahcorde Mar 4, 2020
c60b0ca
rosidl_runtime c and cpp as runtime dependencies
ahcorde Mar 4, 2020
d762ed0
Removed rosidl_generator_c and rosidl_generator_cpp dependency
ahcorde Mar 4, 2020
43dc127
Changed rosidl_generator_cpp for rosidl_runtime_cpp in rosbag2_conver…
ahcorde Mar 13, 2020
08cdab5
Updated rosbag2 rosidl_runtime dependencies
ahcorde Mar 13, 2020
d72351a
removed rosidl_runtime_cpp from test_depend
ahcorde Mar 23, 2020
8691878
Merge branch 'master' into ahcorde/rosidl_runtime
ahcorde Mar 24, 2020
de737d8
keep the originally used dependency type
ahcorde Apr 7, 2020
6e6f6a2
Merge remote-tracking branch 'origin/master' into ahcorde/rosidl_runtime
ahcorde Apr 8, 2020
29073d6
Minor fixes
ahcorde Apr 8, 2020
6a87095
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
4 changes: 2 additions & 2 deletions rosbag2_converter_default_plugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ find_package(rcpputils REQUIRED)
find_package(rmw REQUIRED)
find_package(rmw_fastrtps_cpp QUIET)
find_package(rosbag2_cpp REQUIRED)
find_package(rosidl_generator_cpp REQUIRED)
find_package(rosidl_runtime_cpp REQUIRED)

if(rmw_fastrtps_cpp_FOUND)
add_library(${PROJECT_NAME} SHARED
Expand All @@ -39,7 +39,7 @@ if(rmw_fastrtps_cpp_FOUND)
rcpputils
rmw
rosbag2_cpp
rosidl_generator_cpp)
rosidl_runtime_cpp)

target_include_directories(${PROJECT_NAME}
PUBLIC
Expand Down
2 changes: 1 addition & 1 deletion rosbag2_converter_default_plugins/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<depend>ament_index_cpp</depend>
<depend>pluginlib</depend>
<depend>rosidl_generator_cpp</depend>
<depend>rosidl_runtime_cpp</depend>
<depend>rcpputils</depend>
<depend>rmw</depend>
<depend>rmw_fastrtps_cpp</depend>
Expand Down
15 changes: 11 additions & 4 deletions rosbag2_cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ find_package(pluginlib REQUIRED)
find_package(rcpputils REQUIRED)
find_package(rcutils REQUIRED)
find_package(rosbag2_storage REQUIRED)
find_package(rosidl_generator_cpp REQUIRED)
find_package(rosidl_runtime_c REQUIRED)
find_package(rosidl_runtime_cpp REQUIRED)
find_package(rosidl_typesupport_cpp REQUIRED)
find_package(rosidl_typesupport_introspection_cpp REQUIRED)

Expand All @@ -55,7 +56,8 @@ ament_target_dependencies(${PROJECT_NAME}
rcpputils
rcutils
rosbag2_storage
rosidl_generator_cpp
rosidl_runtime_c
rosidl_runtime_cpp
rosidl_typesupport_introspection_cpp
rosidl_typesupport_cpp
)
Expand Down Expand Up @@ -85,7 +87,12 @@ install(

ament_export_include_directories(include)
ament_export_libraries(${PROJECT_NAME})
ament_export_dependencies(pluginlib rosbag2_storage rosidl_typesupport_introspection_cpp)
ament_export_dependencies(pluginlib
rosbag2_storage
rosidl_runtime_c
rosidl_runtime_cpp
rosidl_typesupport_introspection_cpp
)

if(BUILD_TESTING)
find_package(ament_cmake_gmock REQUIRED)
Expand Down Expand Up @@ -159,7 +166,7 @@ if(BUILD_TESTING)
ament_index_cpp
rcpputils
rosbag2_storage
rosidl_generator_cpp
rosidl_runtime_cpp
rosidl_typesupport_introspection_cpp
rosidl_typesupport_cpp
test_msgs)
Expand Down
4 changes: 3 additions & 1 deletion rosbag2_cpp/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@
<depend>ament_index_cpp</depend>
<depend>pluginlib</depend>
<depend>rcutils</depend>
<depend>rcpputils</depend>
<depend>rosbag2_storage</depend>
<depend>rosidl_generator_cpp</depend>
<depend>rosidl_runtime_c</depend>
<depend>rosidl_runtime_cpp</depend>
<depend>rosidl_typesupport_cpp</depend>
<depend>rosidl_typesupport_introspection_cpp</depend>
<depend>shared_queues_vendor</depend>
Expand Down