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.

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

Port package to ROS 2 #16

Merged
merged 3 commits into from
Feb 10, 2019
Merged

Port package to ROS 2 #16

merged 3 commits into from
Feb 10, 2019

Conversation

vmayoral
Copy link

@vmayoral vmayoral commented Feb 6, 2019

No description provided.

@vmayoral vmayoral mentioned this pull request Feb 6, 2019
Copy link
Contributor

@clalancette clalancette left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few minor things; once those are addressed, I'm happy to merge this.

CMakeLists.txt Outdated
project(eigen_stl_containers)

find_package(catkin REQUIRED)
if(NOT WIN32)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This block is redundant (and actually somewhat in opposition to):

if(NOT CMAKE_CXX_STANDARD)
  set(CMAKE_CXX_STANDARD 14)
endif()

below, so just remove it.

CMakeLists.txt Outdated
add_compile_options(-Wall -Wextra -Wpedantic)
endif()

find_package(ament_cmake REQUIRED)
find_package(Eigen3 QUIET)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can just make this:

find_package(Eigen3 REQUIRED)

And get rid of all of the backwards-compatibility stuff; this will never go onto older Ubuntu versions.

<build_depend>eigen</build_depend>

<build_export_depend>eigen</build_export_depend>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing:

  <export>
    <build_type>ament_cmake</build_type>
  </export>

vmayoral and others added 2 commits February 9, 2019 19:24
Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
@clalancette
Copy link
Contributor

@vmayoral I did a few more fixups in a611d8a . In particular:

  • I removed the rest of the Eigen compat stuff, since now we have Eigen3 REQUIRED, we won't ever run into those situations
  • I removed the stuff bumping the version and the CHANGELOG. While appreciated, this will be done automagically by catkin_generate_changelog/catkin_prepare_release when we prepare the next release of this package. Also, we'll most likely bump the major or minor number for this package when releasing into ROS 2, to ensure there can never be version conflicts between ROS 1 and ROS 2.

With that, I'm happy with this, and I'm going to merge. Thanks for the contribution!

@clalancette clalancette merged commit 3863444 into ros:ros2 Feb 10, 2019
@vmayoral
Copy link
Author

Thanks a lot for the fixes @clalancette! Happy to contribute.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants