find tinyxml and link against it (#1130)

* find tinyxml and link against it * add missing include
ros-visualization · Aug 1, 2017 · 21a76fa · 21a76fa
1 parent 2753be1
commit 21a76fa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -154,6 +154,8 @@ else()
   set(EIGEN3_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
 endif()
 
+find_package(TinyXML REQUIRED)
+
 catkin_python_setup()
 
 if(NOT OGRE_OV_LIBRARIES_ABS)
@@ -206,6 +208,7 @@ include_directories(SYSTEM
   ${OGRE_OV_INCLUDE_DIRS}
   ${OPENGL_INCLUDE_DIR}
   ${PYTHON_INCLUDE_PATH}
+  ${TinyXML_INCLUDE_DIRS}
   ${urdfdom_headers_INCLUDE_DIRS}
 )
 include_directories(src ${catkin_INCLUDE_DIRS})

diff --git a/src/rviz/CMakeLists.txt b/src/rviz/CMakeLists.txt
@@ -139,6 +139,7 @@ target_link_libraries(${PROJECT_NAME}
   ${OGRE_OV_LIBRARIES_ABS}
   ${OPENGL_LIBRARIES}
   ${rviz_ADDITIONAL_LIBRARIES}
+  ${TinyXML_LIBRARIES}
   ${X11_X11_LIB}
   assimp
   yaml-cpp

diff --git a/src/rviz/default_plugin/robot_model_display.cpp b/src/rviz/default_plugin/robot_model_display.cpp
@@ -30,6 +30,7 @@
 #include <OgreSceneNode.h>
 #include <OgreSceneManager.h>
 
+#include <tinyxml.h>
 #include <urdf/model.h>
 
 #include <tf/transform_listener.h>