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

@@ -41,7 +41,7 @@
 #include <map>
 #include <boost/function.hpp>
 
-#include <urdf_interface/model.h>
+#include <urdf_model/model.h>
 
 
 namespace urdf{

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>

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

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

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

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

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

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>