From 65a0c5082fdaf5d3ba9a47c1bc235aef58305250 Mon Sep 17 00:00:00 2001
From: Ioan Sucan <isucan@willowgarage.com>
Date: Mon, 20 May 2013 14:22:44 +0300
Subject: [PATCH] fix circular dep

---
 collada_parser/CMakeLists.txt | 4 ++--
 collada_parser/package.xml    | 4 ++--
 urdf/CMakeLists.txt           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/collada_parser/CMakeLists.txt b/collada_parser/CMakeLists.txt
index 889fc1d..1737882 100644
--- a/collada_parser/CMakeLists.txt
+++ b/collada_parser/CMakeLists.txt
@@ -3,12 +3,12 @@ project(collada_parser)
 
 find_package(Boost REQUIRED system)
 
-find_package(catkin REQUIRED COMPONENTS urdfdom_headers roscpp)
+find_package(catkin REQUIRED COMPONENTS urdfdom_headers urdf_parser_plugin roscpp)
 
 catkin_package( 
   LIBRARIES ${PROJECT_NAME}
   INCLUDE_DIRS include
-  CATKIN_DEPENDS roscpp
+  CATKIN_DEPENDS roscpp urdf_parser_plugin
   DEPENDS urdfdom_headers
 )
 
diff --git a/collada_parser/package.xml b/collada_parser/package.xml
index c72e073..00048af 100644
--- a/collada_parser/package.xml
+++ b/collada_parser/package.xml
@@ -22,12 +22,12 @@
   <build_depend>collada-dom</build_depend>
   <build_depend>roscpp</build_depend>
   <build_depend>urdfdom_headers</build_depend>
-  <build_depend>urdf</build_depend>
+  <build_depend>urdf_parser_plugin</build_depend>
 
   <run_depend>collada-dom</run_depend>
   <run_depend>roscpp</run_depend>
   <run_depend>urdfdom_headers</run_depend>
-  <run_depend>urdf</run_depend>
+  <run_depend>urdf_parser_plugin</run_depend>
 
 </package>
 
diff --git a/urdf/CMakeLists.txt b/urdf/CMakeLists.txt
index d243a62..f93f9a5 100644
--- a/urdf/CMakeLists.txt
+++ b/urdf/CMakeLists.txt
@@ -38,5 +38,5 @@ install(TARGETS ${PROJECT_NAME}
   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
   RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
 
-install(DIRECTORY include//${PROJECT_NAME}/
+install(DIRECTORY include/${PROJECT_NAME}/
   DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})