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

Merged
merged 10 commits into from
Apr 10, 2020
Merged

added rosidl_runtime c and cpp depencencies #100

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6581615
added rosidl_runtime c and cpp depencencies
ahcorde Mar 4, 2020
c78938c
Removed rosidl_generator_c dependency
ahcorde Mar 4, 2020
1c81b45
Fixed rosidl_runtime dependencies
ahcorde Mar 6, 2020
f180b5e
Fixed rosidl_runtime_c dependencies
ahcorde Mar 12, 2020
79a0b4c
Fixed rosidl_runtime_c dependencies
ahcorde Mar 12, 2020
e60791a
Removed rosidl_runtime_c from test_depend
ahcorde Mar 13, 2020
dea8232
Added rosidl_generator_x to rosidl_generator_py
ahcorde Mar 30, 2020
d5c17af
removed rosidl_generator_x dependencies rosidl_typesupport provides a…
ahcorde Apr 1, 2020
614d373
Fixed rosidl_generator_py test
ahcorde Apr 3, 2020
9b511b5
Merge remote-tracking branch 'osrf/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
6 changes: 5 additions & 1 deletion rosidl_generator_py/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if(BUILD_TESTING)

find_package(rmw REQUIRED)
find_package(rosidl_cmake REQUIRED)
find_package(rosidl_generator_c REQUIRED)
find_package(rosidl_runtime_c REQUIRED)

find_package(ament_lint_auto REQUIRED)
ament_lint_auto_find_test_dependencies()
Expand All @@ -27,6 +27,10 @@ if(BUILD_TESTING)
include(cmake/register_py.cmake)
include(cmake/rosidl_generator_py_get_typesupports.cmake)

include_directories(include
${rosidl_runtime_c_INCLUDE_DIRS}
dirk-thomas marked this conversation as resolved.
Show resolved Hide resolved
)

# Trick ament_target_dependencies() into thinking this package has been found
set(rosidl_generator_py_FOUND "1")
set(rosidl_generator_py_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
Expand Down
4 changes: 1 addition & 3 deletions rosidl_generator_py/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,9 @@
<buildtool_export_depend>rosidl_typesupport_c</buildtool_export_depend>
<buildtool_export_depend>rosidl_typesupport_interface</buildtool_export_depend>


<exec_depend>python3-numpy</exec_depend>
<exec_depend>rmw_implementation</exec_depend>
<exec_depend>rmw_implementation_cmake</exec_depend>
<exec_depend>rosidl_generator_c</exec_depend>
ahcorde marked this conversation as resolved.
Show resolved Hide resolved
dirk-thomas marked this conversation as resolved.
Show resolved Hide resolved
<exec_depend>rosidl_parser</exec_depend>

<test_depend>ament_cmake_pytest</test_depend>
Expand All @@ -38,10 +36,10 @@
<test_depend>rmw_implementation</test_depend>
<test_depend>rmw_implementation_cmake</test_depend>
<test_depend>rosidl_cmake</test_depend>
<test_depend>rosidl_generator_c</test_depend>
<test_depend>rosidl_parser</test_depend>
<test_depend>rosidl_typesupport_c</test_depend>
<test_depend>test_interface_files</test_depend>
<test_depend>rosidl_runtime_c</test_depend>

<member_of_group>rosidl_generator_packages</member_of_group>

Expand Down