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 #351

Merged
merged 11 commits into from
Apr 10, 2020
Merged

added rosidl_runtime c and cpp depencencies #351

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fb93dae
added rosidl_runtime c and cpp depencencies
ahcorde Mar 4, 2020
b053eff
Removed rosidl_generator_c and rosidl_generator_cpp dependencies
ahcorde Mar 4, 2020
d9e8234
Restored rmw_fastrtps_shared_cpp dependencies
ahcorde Mar 6, 2020
4183ff7
Fixed rmw_fastrtps_dynamic_cpp rosidl dependencies
ahcorde Mar 6, 2020
fd8377a
Fixed rmw_fastrtps_cpp rosidl dependencies and alphabetizer order
ahcorde Mar 6, 2020
426c0a8
Merge branch 'master' into ahcorde/rosidl_runtime
ahcorde Mar 24, 2020
9bd3b32
Removed rosidl_generator_c depend - rmw_fastrtps_dynamic_cpp
ahcorde Mar 27, 2020
e5b1cbb
Merge branch 'master' into ahcorde/rosidl_runtime
ahcorde Apr 3, 2020
c2d6069
rmw_fastrtps_shared_cpp buildtool_depend and buildtool_export_depend …
ahcorde Apr 3, 2020
7473c68
keep the originally used dependency type
ahcorde Apr 7, 2020
cddd166
Removed rosidl from package.xml
ahcorde Apr 7, 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_fastrtps_cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ find_package(fastrtps REQUIRED CONFIG)
find_package(FastRTPS REQUIRED MODULE)

find_package(rmw REQUIRED)
find_package(rosidl_generator_c REQUIRED)
find_package(rosidl_runtime_c REQUIRED)
find_package(rosidl_typesupport_fastrtps_c REQUIRED)
find_package(rosidl_typesupport_fastrtps_cpp REQUIRED)

Expand Down Expand Up @@ -93,7 +93,7 @@ ament_target_dependencies(rmw_fastrtps_cpp
"rosidl_typesupport_fastrtps_cpp"
"rmw_fastrtps_shared_cpp"
"rmw"
"rosidl_generator_c"
"rosidl_runtime_c"
)

configure_rmw_library(rmw_fastrtps_cpp)
Expand All @@ -107,12 +107,12 @@ PRIVATE "RMW_FASTRTPS_CPP_BUILDING_LIBRARY")
ament_export_include_directories(include)
ament_export_libraries(rmw_fastrtps_cpp)

ament_export_dependencies(rosidl_typesupport_fastrtps_cpp)
ament_export_dependencies(rosidl_typesupport_fastrtps_c)
ament_export_dependencies(rosidl_generator_c)
dirk-thomas marked this conversation as resolved.
Show resolved Hide resolved
ament_export_dependencies(rcutils)
ament_export_dependencies(rmw_fastrtps_shared_cpp)
ament_export_dependencies(rmw)
ament_export_dependencies(rmw_fastrtps_shared_cpp)
ament_export_dependencies(rosidl_runtime_c)
ament_export_dependencies(rosidl_typesupport_fastrtps_c)
ament_export_dependencies(rosidl_typesupport_fastrtps_cpp)

register_rmw_implementation(
"c:rosidl_typesupport_c:rosidl_typesupport_fastrtps_c"
Expand Down
8 changes: 3 additions & 5 deletions rmw_fastrtps_cpp/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,24 @@
<build_depend>rcutils</build_depend>
<build_depend>rmw</build_depend>
<build_depend>rmw_fastrtps_shared_cpp</build_depend>
<build_depend>rosidl_generator_c</build_depend>
<build_depend>rosidl_generator_cpp</build_depend>
<build_depend>rosidl_typesupport_fastrtps_c</build_depend>
<build_depend>rosidl_typesupport_fastrtps_cpp</build_depend>

<build_export_depend>fastcdr</build_export_depend>
<build_export_depend>fastrtps</build_export_depend>
<build_export_depend>fastrtps_cmake_module</build_export_depend>
<build_export_depend>rcutils</build_export_depend>
<build_export_depend>rmw_fastrtps_shared_cpp</build_export_depend>
<build_export_depend>rmw</build_export_depend>
<build_export_depend>rosidl_generator_c</build_export_depend>
<build_export_depend>rosidl_generator_cpp</build_export_depend>
dirk-thomas marked this conversation as resolved.
Show resolved Hide resolved
<build_export_depend>rmw_fastrtps_shared_cpp</build_export_depend>
<build_export_depend>rosidl_typesupport_fastrtps_c</build_export_depend>
<build_export_depend>rosidl_typesupport_fastrtps_cpp</build_export_depend>

<exec_depend>rcutils</exec_depend>
<exec_depend>rmw</exec_depend>
<exec_depend>rmw_fastrtps_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
6 changes: 3 additions & 3 deletions rmw_fastrtps_dynamic_cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ find_package(fastrtps REQUIRED CONFIG)
find_package(FastRTPS REQUIRED MODULE)

find_package(rmw REQUIRED)
find_package(rosidl_generator_c REQUIRED)
find_package(rosidl_runtime_c REQUIRED)
find_package(rosidl_typesupport_fastrtps_c REQUIRED)
find_package(rosidl_typesupport_fastrtps_cpp REQUIRED)
find_package(rosidl_typesupport_introspection_c REQUIRED)
Expand Down Expand Up @@ -102,7 +102,7 @@ ament_target_dependencies(rmw_fastrtps_dynamic_cpp
"rosidl_typesupport_introspection_cpp"
"rmw_fastrtps_shared_cpp"
"rmw"
"rosidl_generator_c"
"rosidl_runtime_c"
)

configure_rmw_library(rmw_fastrtps_dynamic_cpp)
Expand All @@ -120,7 +120,7 @@ ament_export_dependencies(rosidl_typesupport_fastrtps_c)
ament_export_dependencies(rosidl_typesupport_fastrtps_cpp)
ament_export_dependencies(rosidl_typesupport_introspection_cpp)
ament_export_dependencies(rosidl_typesupport_introspection_c)
ament_export_dependencies(rosidl_generator_c)
ament_export_dependencies(rosidl_runtime_c)
ament_export_dependencies(rcpputils)
ament_export_dependencies(rcutils)
ament_export_dependencies(rmw_fastrtps_shared_cpp)
Expand Down
3 changes: 2 additions & 1 deletion rmw_fastrtps_dynamic_cpp/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,13 @@
<build_export_depend>rcutils</build_export_depend>
<build_export_depend>rmw</build_export_depend>
<build_export_depend>rmw_fastrtps_shared_cpp</build_export_depend>
<build_export_depend>rosidl_generator_c</build_export_depend>
<build_export_depend>rosidl_typesupport_fastrtps_c</build_export_depend>
<build_export_depend>rosidl_typesupport_fastrtps_cpp</build_export_depend>
<build_export_depend>rosidl_typesupport_introspection_c</build_export_depend>
<build_export_depend>rosidl_typesupport_introspection_cpp</build_export_depend>

<depend>rosidl_runtime_c</depend>

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

Expand Down