rviz and interactive marker rebuild

RoboStack · Sep 25, 2020 · bce61cb · bce61cb
1 parent f7e6c34
commit bce61cb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/patch/ros-noetic-interactive-markers.win.patch b/patch/ros-noetic-interactive-markers.win.patch
@@ -0,0 +1,15 @@
+diff --git a/include/interactive_markers/interactive_marker_client.h b/include/interactive_markers/interactive_marker_client.h
+index bd1a1b7..193428e 100644
+--- a/include/interactive_markers/interactive_marker_client.h
++++ b/include/interactive_markers/interactive_marker_client.h
+@@ -50,6 +50,10 @@
+
+ #include "detail/state_machine.h"
+
++#ifdef ERROR
++#undef ERROR
++#endif
++
+ namespace interactive_markers
+ {
+
diff --git a/win.yaml b/win.yaml
@@ -27,7 +27,6 @@ packages_select_by_deps:
   #  TODO Win
   ##
   - rviz
-  - diagnostic_updater
   # - desktop-full
   # - moveit
   # - robot_localization