From 455b57c76de15fcd1fce48b45b5b64e4bdd296b0 Mon Sep 17 00:00:00 2001 From: William Woodall Date: Mon, 15 Jul 2013 22:00:23 -0700 Subject: [PATCH] change user of urdfdom, as it is not a catkin pkg --- urdf/CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/urdf/CMakeLists.txt b/urdf/CMakeLists.txt index 180ebab..0afcb03 100644 --- a/urdf/CMakeLists.txt +++ b/urdf/CMakeLists.txt @@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 2.8.3) project(urdf) find_package(Boost REQUIRED thread) -find_package(catkin REQUIRED COMPONENTS urdfdom urdfdom_headers urdf_parser_plugin pluginlib rosconsole_bridge roscpp) +find_package(urdfdom REQUIRED) +find_package(catkin REQUIRED COMPONENTS urdfdom_headers urdf_parser_plugin pluginlib rosconsole_bridge roscpp) catkin_package( LIBRARIES ${PROJECT_NAME} @@ -16,16 +17,16 @@ link_directories(${Boost_LIBRARY_DIRS}) include_directories(include) -include_directories(${catkin_INCLUDE_DIRS}) +include_directories(${catkin_INCLUDE_DIRS} ${urdfdom_INCLUDE_DIRS}) link_directories(${catkin_LIBRARY_DIRS}) find_library(TINYXML tinyxml) add_library(${PROJECT_NAME} src/model.cpp src/rosconsole_bridge.cpp) -target_link_libraries(${PROJECT_NAME} ${TINYXML} ${catkin_LIBRARIES}) +target_link_libraries(${PROJECT_NAME} ${TINYXML} ${catkin_LIBRARIES} ${urdfdom_LIBRARIES}) -if(APPLE) - set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") +if(APPLE) + set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") endif(APPLE) catkin_add_gtest(test_parser EXCLUDE_FROM_ALL test/test_robot_model_parser.cpp)