From 36dfce24037312f5c141d0b248771e710dcdad30 Mon Sep 17 00:00:00 2001
From: Ioan Sucan <isucan@willowgarage.com>
Date: Mon, 25 Jun 2012 12:19:35 -0700
Subject: [PATCH] add correct includes for the new layout of urdfdom, and add
 deprecation warnings if old includes are used

---
 collada_parser/include/collada_parser/collada_parser.h | 2 +-
 collada_parser/src/collada_parser.cpp                  | 2 +-
 urdf_interface/include/urdf_interface/color.h          | 8 ++++++++
 urdf_interface/include/urdf_interface/joint.h          | 8 ++++++++
 urdf_interface/include/urdf_interface/link.h           | 8 ++++++++
 urdf_interface/include/urdf_interface/model.h          | 8 ++++++++
 urdf_interface/include/urdf_interface/pose.h           | 8 ++++++++
 urdf_interface/manifest.xml                            | 2 +-
 8 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 urdf_interface/include/urdf_interface/color.h
 create mode 100644 urdf_interface/include/urdf_interface/joint.h
 create mode 100644 urdf_interface/include/urdf_interface/link.h
 create mode 100644 urdf_interface/include/urdf_interface/model.h
 create mode 100644 urdf_interface/include/urdf_interface/pose.h

diff --git a/collada_parser/include/collada_parser/collada_parser.h b/collada_parser/include/collada_parser/collada_parser.h
index 84278ae..fe7c666 100644
--- a/collada_parser/include/collada_parser/collada_parser.h
+++ b/collada_parser/include/collada_parser/collada_parser.h
@@ -41,7 +41,7 @@
 #include <map>
 #include <boost/function.hpp>
 
-#include <urdf_interface/model.h>
+#include <urdf_model/model.h>
 
 
 namespace urdf{
diff --git a/collada_parser/src/collada_parser.cpp b/collada_parser/src/collada_parser.cpp
index c59523e..f156453 100644
--- a/collada_parser/src/collada_parser.cpp
+++ b/collada_parser/src/collada_parser.cpp
@@ -56,7 +56,7 @@
 
 #include <ros/ros.h>
 #include <collada_parser/collada_parser.h>
-#include <urdf_interface/model.h>
+#include <urdf_model/model.h>
 
 #ifndef HAVE_MKSTEMPS
 #include <fstream>
diff --git a/urdf_interface/include/urdf_interface/color.h b/urdf_interface/include/urdf_interface/color.h
new file mode 100644
index 0000000..44c9b01
--- /dev/null
+++ b/urdf_interface/include/urdf_interface/color.h
@@ -0,0 +1,8 @@
+#ifndef URDF_INTERFACE_COLOR_
+#define URDF_INTERFACE_COLOR_
+
+#warning "Please Use #include <urdf_model/color.h>"
+
+#include <urdf_model/color.h>
+
+#endif
diff --git a/urdf_interface/include/urdf_interface/joint.h b/urdf_interface/include/urdf_interface/joint.h
new file mode 100644
index 0000000..c9a0f82
--- /dev/null
+++ b/urdf_interface/include/urdf_interface/joint.h
@@ -0,0 +1,8 @@
+#ifndef URDF_INTERFACE_JOINT_
+#define URDF_INTERFACE_JOINT_
+
+#warning "Please Use #include <urdf_model/joint.h>"
+
+#include <urdf_model/joint.h>
+
+#endif
diff --git a/urdf_interface/include/urdf_interface/link.h b/urdf_interface/include/urdf_interface/link.h
new file mode 100644
index 0000000..7b0f732
--- /dev/null
+++ b/urdf_interface/include/urdf_interface/link.h
@@ -0,0 +1,8 @@
+#ifndef URDF_INTERFACE_LINK_
+#define URDF_INTERFACE_LINK_
+
+#warning "Please Use #include <urdf_model/link.h>"
+
+#include <urdf_model/link.h>
+
+#endif
diff --git a/urdf_interface/include/urdf_interface/model.h b/urdf_interface/include/urdf_interface/model.h
new file mode 100644
index 0000000..56386d8
--- /dev/null
+++ b/urdf_interface/include/urdf_interface/model.h
@@ -0,0 +1,8 @@
+#ifndef URDF_INTERFACE_MODEL_
+#define URDF_INTERFACE_MODEL_
+
+#warning "Please Use #include <urdf_model/model.h>"
+
+#include <urdf_model/model.h>
+
+#endif
diff --git a/urdf_interface/include/urdf_interface/pose.h b/urdf_interface/include/urdf_interface/pose.h
new file mode 100644
index 0000000..84c529d
--- /dev/null
+++ b/urdf_interface/include/urdf_interface/pose.h
@@ -0,0 +1,8 @@
+#ifndef URDF_INTERFACE_POSE_
+#define URDF_INTERFACE_POSE_
+
+#warning "Please Use #include <urdf_model/pose.h>"
+
+#include <urdf_model/pose.h>
+
+#endif
diff --git a/urdf_interface/manifest.xml b/urdf_interface/manifest.xml
index e8488ce..e01c427 100644
--- a/urdf_interface/manifest.xml
+++ b/urdf_interface/manifest.xml
@@ -13,7 +13,7 @@
   <rosdep name="urdfdom" />
 
   <export>
-    <cpp cflags="`pkg-config --cflags urdfdom`"/>
+    <cpp cflags="-I${prefix}/include `pkg-config --cflags urdfdom`"/>
   </export>
 
 </package>