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

Add option to link against non-catkin librealsense #204

Merged
merged 2 commits into from
Mar 17, 2017

Conversation

rojkov
Copy link

@rojkov rojkov commented Feb 15, 2017

In OpenEmbedded setups where both meta-ros and meta-intel-realsense layers are used it's problematic to avoid two copies of librealsense installed onto an embedded target: one catkit-based installed under /opt/ros and one other installed to a standard system location.

This patch adds an option making realsense_camera link against librealsense provided by the host system.

By default the currently existing behavior is preserved.

@rojkov
Copy link
Author

rojkov commented Mar 16, 2017

ping.
The corresponding meta-ros PR is here ros/meta-ros#457. And it has been tested already.

Copy link

@mdhorn mdhorn left a comment

Choose a reason for hiding this comment

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

Sorry, we were in the middle of a regression which needed to be completed before merging new code.

I also want to try a few test builds to approve possible fails in the ROS Build farm.

The code looks okay to me, but please rebase this branch as there have been minor updates.

Dmitry Rozhkov added 2 commits March 17, 2017 10:54
In OpenEmbedded setups where both meta-ros and
meta-intel-realsense layers are used it's problematic
to avoid two copies of librealsense installed onto
an embedded target: one catkit-based installed under
/opt/ros and one other installed to a standard system
location.

This patch adds an option making realsense_camera link
against librealsense provided by the host system.

By default the currently existing behavior is preserved.

Signed-off-by: Dmitry Rozhkov <[email protected]>
roslint depends on catkin_run_tests_target() which is defined only
when CATKIN_ENABLE_TESTING is True.

Thus run roslint functions in CMakeLists.txt only when testing
is enabled.

Signed-off-by: Dmitry Rozhkov <[email protected]>
@rojkov
Copy link
Author

rojkov commented Mar 17, 2017

  • rebased to the current indigo-devel
  • made running roslint tasks conditional since they require CATKIN_ENABLE_TESTING=ON
  • force pushed.

@mdhorn mdhorn merged commit ae877c7 into IntelRealSense:indigo-devel Mar 17, 2017
@fmessmer
Copy link

fmessmer commented Mar 20, 2017

Somehow 701f939 lets our Travis CI fail due to

Errors     << realsense_camera:cmake /root/catkin_ws/logs/realsense_camera/build.cmake.000.log

CMake Error at /root/catkin_ws/src/realsense/realsense_camera/CMakeLists.txt:122 (roslint_cpp):

  Unknown CMake command "roslint_cpp".

see https://travis-ci.org/ipa320/cob_robots/jobs/212986198#L6578

our travis.yml can be seen here: https://github.com/ipa320/cob_robots/blob/indigo_dev/.travis.yml


Submitting an issue seems to be blocked somehow...

@mdhorn
Copy link

mdhorn commented Mar 20, 2017

There appears to be some race condition in the change.
catkin_make_isolated also has the same fail signature, where catkin_make_isolated -j1 passes.
I'll be submitting a PR with a minor change to fix this.

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

3 participants