From ceccd59a9b25b290a2e0af54ef498d1b3aff6607 Mon Sep 17 00:00:00 2001
From: Robert Haschke <rhaschke@users.noreply.github.com>
Date: Mon, 30 Jan 2017 17:16:29 +0100
Subject: [PATCH] [Indigo] cleanup urdfdom compatibility (cherry-picking #27)

---
 CMakeLists.txt          | 4 +++-
 include/srdfdom/model.h | 2 +-
 package.xml             | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a28ecea..e3d8b55 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,13 +7,15 @@ include_directories(SYSTEM ${Boost_INCLUDE_DIR})
 find_package(console_bridge REQUIRED)
 find_package(urdfdom_headers REQUIRED)
 
-find_package(catkin REQUIRED COMPONENTS cmake_modules urdfdom_py)
+find_package(catkin REQUIRED COMPONENTS cmake_modules urdf urdfdom_py)
 
 find_package(TinyXML REQUIRED)
 
 include_directories(include ${TinyXML_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS} ${console_bridge_INCLUDE_DIRS} ${urdfdom_headers_INCLUDE_DIRS})
 link_directories(${catkin_LIBRARY_DIRS})
 
+add_compile_options(-std=c++11)
+
 catkin_python_setup()
 
 catkin_package(
diff --git a/include/srdfdom/model.h b/include/srdfdom/model.h
index 9ba7cf7..8ec2000 100644
--- a/include/srdfdom/model.h
+++ b/include/srdfdom/model.h
@@ -41,7 +41,7 @@
 #include <string>
 #include <vector>
 #include <utility>
-#include <urdf_model/model.h>
+#include <urdf/model.h>
 #include <boost/shared_ptr.hpp>
 #include <tinyxml.h>
 
diff --git a/package.xml b/package.xml
index fe26d28..b74ad9f 100644
--- a/package.xml
+++ b/package.xml
@@ -16,6 +16,7 @@
   <build_depend>boost</build_depend>
   <build_depend>cmake_modules</build_depend>
   <build_depend>libconsole-bridge-dev</build_depend>
+  <build_depend>urdf</build_depend>
   <build_depend>liburdfdom-headers-dev</build_depend>
   <build_depend>urdfdom_py</build_depend>
   <build_depend>tinyxml</build_depend>