From 8d3f634c896c3ce8cc02151bd53a68c0e3040ce9 Mon Sep 17 00:00:00 2001
From: v4hn <me@v4hn.de>
Date: Tue, 29 Mar 2016 21:01:08 +0200
Subject: [PATCH] explicitly link rviz' default_plugin library

The library is not exported anymore and now is provided separately from rviz_LIBRARIES.
See https://github.com/ros-visualization/rviz/pull/979 for details.
---
 benchmarks_gui/CMakeLists.txt                            | 1 +
 visualization/motion_planning_rviz_plugin/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/benchmarks_gui/CMakeLists.txt b/benchmarks_gui/CMakeLists.txt
index 9a2d66b967..d0d81c416b 100644
--- a/benchmarks_gui/CMakeLists.txt
+++ b/benchmarks_gui/CMakeLists.txt
@@ -70,6 +70,7 @@ add_executable(moveit_benchmark_gui ${SOURCES} ${MOC_FILES} ${UIC_FILES})
 
 target_link_libraries(moveit_benchmark_gui
   ${catkin_LIBRARIES}
+  ${rviz_DEFAULT_PLUGIN_LIBRARIES}
   ${OGRE_LIBRARIES}
   ${QT_LIBRARIES}
   ${Boost_LIBRARIES}
diff --git a/visualization/motion_planning_rviz_plugin/CMakeLists.txt b/visualization/motion_planning_rviz_plugin/CMakeLists.txt
index 7edbedac17..7ed189ab90 100644
--- a/visualization/motion_planning_rviz_plugin/CMakeLists.txt
+++ b/visualization/motion_planning_rviz_plugin/CMakeLists.txt
@@ -33,7 +33,7 @@ add_library(${MOVEIT_LIB_NAME}_core ${SOURCE_FILES} ${MOC_SOURCES} ${UIC_FILES})
 target_link_libraries(${MOVEIT_LIB_NAME}_core
   moveit_rviz_plugin_render_tools
   moveit_planning_scene_rviz_plugin_core
-  ${catkin_LIBRARIES} ${OGRE_LIBRARIES} ${QT_LIBRARIES} ${Boost_LIBRARIES})
+  ${catkin_LIBRARIES} ${rviz_DEFAULT_PLUGIN_LIBRARIES} ${OGRE_LIBRARIES} ${QT_LIBRARIES} ${Boost_LIBRARIES})
 
 add_library(${MOVEIT_LIB_NAME} src/plugin_init.cpp)
 target_link_libraries(${MOVEIT_LIB_NAME} ${MOVEIT_LIB_NAME}_core ${catkin_LIBRARIES} ${Boost_LIBRARIES})