niklas/rcl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed rosidl_generator_c/cpp to rosidl_runtime_c/cpp (#588)

Browse source 
* Changed rosidl_generator_c/cpp to rosidl_runtime_c/cpp

Signed-off-by: ahcorde <ahcorde@gmail.com>

* Fixed rcl rcl_runtime_c dependency

Signed-off-by: ahcorde <ahcorde@gmail.com>

* Fixed rcl_action rcl_runtime_c dependency

Signed-off-by: ahcorde <ahcorde@gmail.com>

* Fixed rcl_lifecycle rcl_runtime_c dependency

Signed-off-by: ahcorde <ahcorde@gmail.com>

* keep the originally used dependency type

Signed-off-by: ahcorde <ahcorde@gmail.com>
This commit is contained in:
Alejandro Hernández Cordero 2020-04-10 12:25:26 +02:00 • committed by GitHub
parent 730bb0ee4f
commit 08e0c715c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rcl/CMakeLists.txt
View file

@ -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)
@ -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"
)
@ -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)

2
rcl/package.xml
View file

@ -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>

8
rcl_action/CMakeLists.txt
View file

@ -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
@ -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")
@ -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
rcl_action/package.xml
View file

@ -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>

9
rcl_lifecycle/CMakeLists.txt
View file

@ -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)
@ -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")
@ -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(

4
rcl_lifecycle/package.xml
View file

@ -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>
<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>