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

Changed rosidl_generator_c/cpp to rosidl_runtime_c/cpp #588

Merged
merged 9 commits into from
Apr 10, 2020
Merged

Changed rosidl_generator_c/cpp to rosidl_runtime_c/cpp #588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6bc0621
Changed rosidl_generator_c/cpp to rosidl_runtime_c/cpp
ahcorde Mar 5, 2020
837f099
Fixed rcl rcl_runtime_c dependency
ahcorde Mar 6, 2020
eca7fe9
Fixed rcl_action rcl_runtime_c dependency
ahcorde Mar 6, 2020
831d217
Fixed rcl_lifecycle rcl_runtime_c dependency
ahcorde Mar 6, 2020
d112f75
Merge branch 'master' into ahcorde/rosidl_runtime
ahcorde Mar 24, 2020
a2e735e
Merge branch 'master' into ahcorde/rosidl_runtime
ahcorde Apr 3, 2020
252ff43
Merge remote-tracking branch 'origin/master' into ahcorde/rosidl_runtime
ahcorde Apr 6, 2020
ee98f21
keep the originally used dependency type
ahcorde Apr 7, 2020
29eabd1
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
10 changes: 5 additions & 5 deletions rcl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ find_package(rcl_yaml_param_parser REQUIRED)
find_package(rcutils REQUIRED)
find_package(rmw REQUIRED)
find_package(rmw_implementation REQUIRED)
find_package(rosidl_generator_c REQUIRED)
find_package(rosidl_runtime_c REQUIRED)
find_package(tracetools REQUIRED)

include_directories(include)
Expand Down Expand Up @@ -68,11 +68,11 @@ add_library(${PROJECT_NAME} ${${PROJECT_NAME}_sources})
ament_target_dependencies(${PROJECT_NAME}
"rcl_interfaces"
"rcl_yaml_param_parser"
"rmw_implementation"
"rmw"
"rcutils"
"rosidl_generator_c"
"rmw"
"rmw_implementation"
${RCL_LOGGING_IMPL}
"rosidl_runtime_c"
"tracetools"
)

Expand Down Expand Up @@ -103,8 +103,8 @@ ament_export_dependencies(rcl_yaml_param_parser)
ament_export_dependencies(rmw_implementation)
ament_export_dependencies(rmw)
ament_export_dependencies(rcutils)
ament_export_dependencies(rosidl_generator_c)
ament_export_dependencies(${RCL_LOGGING_IMPL})
ament_export_dependencies(rosidl_runtime_c)
ament_export_dependencies(tracetools)

if(BUILD_TESTING)
Expand Down
2 changes: 1 addition & 1 deletion rcl/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<depend>rcl_yaml_param_parser</depend>
<depend>rcutils</depend>
<depend>rmw_implementation</depend>
<depend>rosidl_generator_c</depend>
<depend>rosidl_runtime_c</depend>
<depend>tracetools</depend>

<test_depend>ament_cmake_gtest</test_depend>
Expand Down
8 changes: 4 additions & 4 deletions rcl_action/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ project(rcl_action)

find_package(ament_cmake_ros REQUIRED)

find_package(rosidl_generator_c REQUIRED)
find_package(action_msgs REQUIRED)
find_package(rcl REQUIRED)
find_package(rcutils REQUIRED)
find_package(rmw REQUIRED)
find_package(rosidl_runtime_c REQUIRED)

include_directories(
include
Expand Down Expand Up @@ -54,7 +54,7 @@ ament_target_dependencies(${PROJECT_NAME}
"rcl"
"rcutils"
"rmw"
"rosidl_generator_c"
"rosidl_runtime_c"
)

rcl_set_symbol_visibility_hidden(${PROJECT_NAME} LANGUAGE "C")
Expand Down Expand Up @@ -205,10 +205,10 @@ endif()
# specific order: dependents before dependencies
ament_export_include_directories(include)
ament_export_libraries(${PROJECT_NAME})
ament_export_dependencies(action_msgs)
ament_export_dependencies(ament_cmake)
ament_export_dependencies(rcl)
ament_export_dependencies(rcutils)
ament_export_dependencies(rmw)
ament_export_dependencies(action_msgs)
ament_export_dependencies(rosidl_generator_c)
ament_export_dependencies(rosidl_runtime_c)
ament_package()
2 changes: 1 addition & 1 deletion rcl_action/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<depend>rcl</depend>
<depend>rcutils</depend>
<depend>rmw</depend>
<depend>rosidl_generator_c</depend>
<depend>rosidl_runtime_c</depend>

<test_depend>ament_cmake_gtest</test_depend>
<test_depend>ament_lint_common</test_depend>
Expand Down
9 changes: 5 additions & 4 deletions rcl_lifecycle/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ find_package(lifecycle_msgs REQUIRED)
find_package(rcl REQUIRED)
find_package(rcutils REQUIRED)
find_package(rmw REQUIRED)
find_package(rosidl_generator_c)
find_package(rosidl_runtime_c REQUIRED)

include_directories(include)

Expand Down Expand Up @@ -43,10 +43,10 @@ add_library(

# specific order: dependents before dependencies
ament_target_dependencies(rcl_lifecycle
"rcl"
"lifecycle_msgs"
"rosidl_generator_c"
"rcl"
"rcutils"
"rosidl_runtime_c"
)

rcl_set_symbol_visibility_hidden(${PROJECT_NAME} LANGUAGE "C")
Expand Down Expand Up @@ -102,9 +102,10 @@ endif()
ament_export_include_directories(include)
ament_export_libraries(${PROJECT_NAME})
ament_export_dependencies(ament_cmake)
ament_export_dependencies(rcl)
ament_export_dependencies(lifecycle_msgs)
ament_export_dependencies(rcl)
ament_export_dependencies(rcutils)
ament_export_dependencies(rosidl_runtime_c)
ament_package()

install(
Expand Down
4 changes: 2 additions & 2 deletions rcl_lifecycle/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
<build_depend>rcl</build_depend>
<build_depend>rcutils</build_depend>
<build_depend>rmw</build_depend>
<build_depend>rosidl_generator_c</build_depend>
<build_depend>rosidl_runtime_c</build_depend>
dirk-thomas marked this conversation as resolved.
Show resolved Hide resolved

<exec_depend>lifecycle_msgs</exec_depend>
<exec_depend>rcl</exec_depend>
<exec_depend>rcutils</exec_depend>
<exec_depend>rmw</exec_depend>
<exec_depend>rosidl_generator_c</exec_depend>
<exec_depend>rosidl_runtime_c</exec_depend>

<test_depend>ament_cmake_gtest</test_depend>
<test_depend>ament_lint_common</test_depend>
Expand Down