From 26639f39badbdaaa6db70970b64e637aa2a16a62 Mon Sep 17 00:00:00 2001
From: William Woodall <william@osrfoundation.org>
Date: Tue, 24 Jun 2014 17:47:15 -0700
Subject: [PATCH] update usage of urdfdom_headers for indigo/trusty

---
 collada_parser/CMakeLists.txt     | 5 +++--
 urdf_parser_plugin/CMakeLists.txt | 5 ++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/collada_parser/CMakeLists.txt b/collada_parser/CMakeLists.txt
index 25e912c..43ed0c8 100644
--- a/collada_parser/CMakeLists.txt
+++ b/collada_parser/CMakeLists.txt
@@ -3,7 +3,8 @@ project(collada_parser)
 
 find_package(Boost REQUIRED system)
 
-find_package(catkin REQUIRED COMPONENTS urdfdom_headers urdf_parser_plugin roscpp class_loader)
+find_package(catkin REQUIRED COMPONENTS urdf_parser_plugin roscpp class_loader)
+find_package(urdfdom_headers REQUIRED)
 
 catkin_package( 
   LIBRARIES ${PROJECT_NAME}
@@ -13,7 +14,7 @@ catkin_package(
 )
 
 include_directories(${Boost_INCLUDE_DIR})
-include_directories(include ${catkin_INCLUDE_DIRS})
+include_directories(include ${catkin_INCLUDE_DIRS} ${urdfdom_headers_INCLUDE_DIRS})
 
 set(CMAKE_MODULE_PATH  ${PROJECT_SOURCE_DIR}/cmake-extensions/)
 find_package(PkgConfig)
diff --git a/urdf_parser_plugin/CMakeLists.txt b/urdf_parser_plugin/CMakeLists.txt
index d193fe6..75c6854 100644
--- a/urdf_parser_plugin/CMakeLists.txt
+++ b/urdf_parser_plugin/CMakeLists.txt
@@ -1,14 +1,13 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(urdf_parser_plugin)
 
-find_package(catkin REQUIRED urdfdom_headers)
+find_package(catkin REQUIRED)
+find_package(urdfdom_headers REQUIRED)
 
 catkin_package(
   INCLUDE_DIRS include
   DEPENDS urdfdom_headers 
 )
 
-include_directories(include)
-
 install(DIRECTORY include/${PROJECT_NAME}/
   DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})