moveit_ros_perception: make OpenGL parts optional #698
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
davetcoleman
reviewed
Dec 1, 2017
| set(gl_LIBS ${gl_LIBS} ${OPENGL_LIBRARIES}) | ||
| endif(OPENGL_FOUND) | ||
| set(perception_GL_INCLUDE_DIRS "mesh_filter/include" "depth_image_octomap_updater/include") | ||
| set(SYSTEM_GL_INCLUDE_DIRS ${GLEW_INCLUDE_DIR} ${GLUT_INCLUDE_DIR}) |
There was a problem hiding this comment.
this line seems unused, could you please explain?
There was a problem hiding this comment.
It is used in line 91. If BUILD_OPENGL is not set, SYSTEM_GL_INCLUDE_DIRS is empty; if BUILD_OPENGL is set, the paths are set as SYSTEM include directories.
|
I just want to inform @rojkov that I am providing his patch upstream. |
|
In this discussion, I came up with the idea to actually rename the option |
But build everything by default. This commit is motivated by the work on the OpenEmbedded layer for ROS, a cross-compilation tool chain environment for ROS packages. We would like to allow to use moveit_ros_perception in embedded systems without OpenGL support. Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com> [Ported Dmitry's patch from indigo to current kinetic branch, renamed build config, elaborated commit message] Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
bulwahn
force-pushed
the
kinetic-devel
branch
from
719bef7
to
8609bde
Compare
|
Sure, |
davetcoleman
approved these changes
Dec 4, 2017
|
Merging because minor change. |
rhaschke
pushed a commit
that referenced
this pull request
Jul 12, 2018
Fixes a regression introduced by #698
rhaschke
pushed a commit
that referenced
this pull request
Jul 17, 2018
Fixes a regression introduced by #698
dg-shadow
pushed a commit
to shadow-robot/moveit
that referenced
this pull request
Jul 30, 2018
Fixes a regression introduced by moveit#698
mayman99
pushed a commit
to mayman99/moveit
that referenced
this pull request
Aug 25, 2018
Fixes a regression introduced by moveit#698
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
We make OpenGL parts optional, but build everything by default.
This commit is motivated by the work on the OpenEmbedded layer for ROS, a cross-compilation tool chain environment for ROS packages. We would like to allow to use moveit_ros_perception in embedded systems without OpenGL support.
Dmitry Rozhkov is the original author of this patch. I ported the patch from indigo to the current kinetic branch and elaborated the commit message.
Checklist
BUILD_OPENGLfeature.