Skip to content

Commit e695a67

Browse files
committed
update patch using ros-noetic fix
1 parent 5aac344 commit e695a67

File tree

1 file changed

+55
-3
lines changed

1 file changed

+55
-3
lines changed
Lines changed: 55 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,57 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 0452e0485..38b72376a 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -17,8 +17,10 @@ if(WITH_OPENGL)
6+
7+
set(GL_LIBS ${GL_LIBS} ${OPENGL_LIBRARIES})
8+
if(APPLE)
9+
- find_package(FreeGLUT REQUIRED)
10+
- set(SYSTEM_GL_LIBRARIES ${GLEW_LIBRARIES} GLEW::GLEW FreeGLUT::freeglut)
11+
+ list(INSERT CMAKE_FRAMEWORK_PATH 0 /System/Library/Frameworks)
12+
+ find_package(GLUT REQUIRED)
13+
+ # find_package(FreeGLUT REQUIRED)
14+
+ set(SYSTEM_GL_LIBRARIES ${GLEW_LIBRARIES} GLEW::GLEW GLUT::GLUT)
15+
else()
16+
find_package(GLUT REQUIRED)
17+
if(WIN32)
18+
diff --git a/mesh_filter/src/gl_renderer.cpp b/mesh_filter/src/gl_renderer.cpp
19+
index e528cb5b5..9d1689cf6 100644
20+
--- a/mesh_filter/src/gl_renderer.cpp
21+
+++ b/mesh_filter/src/gl_renderer.cpp
22+
@@ -37,11 +37,13 @@
23+
#include <GL/glew.h>
24+
#ifdef __APPLE__
25+
#include <OpenGL/glu.h>
26+
+#include <OpenGL/gl.h>
27+
+#include <GLUT/glut.h>
28+
#else
29+
#include <GL/glu.h>
30+
#include <GL/glut.h>
31+
-#endif
32+
#include <GL/freeglut.h>
33+
+#endif
34+
#include <moveit/mesh_filter/gl_renderer.hpp>
35+
#include <moveit/utils/logger.hpp>
36+
#include <sstream>
37+
@@ -405,8 +407,13 @@ void mesh_filter::GLRenderer::createGLContext()
38+
glutIconifyWindow();
39+
glutHideWindow();
40+
41+
- for (int i = 0; i < 10; ++i)
42+
- glutMainLoopEvent();
43+
+ for (int i = 0; i < 10; ++i){
44+
+ #ifdef __APPLE__
45+
+ glutCheckLoop();
46+
+ #else
47+
+ glutMainLoopEvent();
48+
+ #endif
49+
+ }
50+
51+
s_context.at(thread_id) = std::pair<unsigned, GLuint>(1, window_id);
52+
}
153
diff --git a/semantic_world/CMakeLists.txt b/semantic_world/CMakeLists.txt
2-
index dc8d941da..61f34d777 100644
54+
index dc8d941da..0baff31eb 100644
355
--- a/semantic_world/CMakeLists.txt
456
+++ b/semantic_world/CMakeLists.txt
557
@@ -13,6 +13,8 @@ ament_target_dependencies(
@@ -8,7 +60,7 @@ index dc8d941da..61f34d777 100644
860
Eigen3
961
- Boost)
1062
+ Boost
11-
+ OpenCV
12-
+)
63+
+ OpenCV)
64+
+
1365

1466
install(DIRECTORY include/ DESTINATION include/moveit_ros_perception)

0 commit comments

Comments
 (0)