-
Notifications
You must be signed in to change notification settings - Fork 179
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
Add multi-release support, bump SDK to 2.11.3.121 for xenial and 2.9.3.43 for trusty #127
Conversation
@@ -100,6 +101,5 @@ if (CATKIN_ENABLE_TESTING) | |||
roslaunch_add_file_check(launch/camera.launch) | |||
roslaunch_add_file_check(launch/stereo.launch) | |||
|
|||
find_package(roslint REQUIRED) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This line needs to remain, or the code linter macro won't work.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I removed the roslint find_package for catkin and added the line back
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The issue is that roslint
is only a test_depend
, so it needs to only be looked for inside the if(CATKIN_ENABLE_TESTING)
block.
Thanks very much for looking at this— I know there have been a number of reports around 16.04, particularly in #73, a previous PR along similar lines. It looks like you have a bunch of
|
I'd like to see the indigo compatibility maintained as there are still several years left in indigo support and I'm sure there's a lot of robots out there running indigo with pointgrey cameras still (my lab has at least one). Perhaps create an indigo-devel branch like many big ROS project have adopted and occasionally backport changes if they build (while maintaining this diff in the SDK version of the cmake). What do you think about this? |
I added version selection for Ubuntu releases by using code name, I think this way both indigo/trusty and kinetic/xenial can be supported |
@mikepurvis, how does this look now? |
Looks terrific. Thanks for your patience and persistence in getting this through. |
Fixed all catkin lint -W2 errors and warnings.
Only significant change is change the how
download_flycap
is run from cmake: Execution bit of the script is removed and the cmake invoke python to run the script instead of running the script as executable. This is done to resolve warning about not installed executable.Use cmake magic to choose which version on flycap to use for xenial and trusty thus allow both release to be used.
Bump the SDK version for xenial to
2.3.11.121
and for trusty to2.3.9.43
.