bkinnightskytw
/
kdl_parser
mirror of https://github.com/existedinnettw/kdl_parser.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix circular dep

This commit is contained in:
Ioan Sucan 2013-05-20 14:22:44 +03:00
parent 4f73b461fe
commit 65a0c5082f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
collada_parser/CMakeLists.txt
View File

@ -3,12 +3,12 @@ project(collada_parser)
find_package(Boost REQUIRED system) 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( catkin_package(
LIBRARIES ${PROJECT_NAME} LIBRARIES ${PROJECT_NAME}
INCLUDE_DIRS include INCLUDE_DIRS include
CATKIN_DEPENDS roscpp CATKIN_DEPENDS roscpp urdf_parser_plugin
DEPENDS urdfdom_headers DEPENDS urdfdom_headers
) )

4
collada_parser/package.xml
View File

@ -22,12 +22,12 @@
<build_depend>collada-dom</build_depend> <build_depend>collada-dom</build_depend>
<build_depend>roscpp</build_depend> <build_depend>roscpp</build_depend>
<build_depend>urdfdom_headers</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>collada-dom</run_depend>
<run_depend>roscpp</run_depend> <run_depend>roscpp</run_depend>
<run_depend>urdfdom_headers</run_depend> <run_depend>urdfdom_headers</run_depend>
<run_depend>urdf</run_depend> <run_depend>urdf_parser_plugin</run_depend>
</package> </package>

2
urdf/CMakeLists.txt
View File

@ -38,5 +38,5 @@ install(TARGETS ${PROJECT_NAME}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}) RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
install(DIRECTORY include//${PROJECT_NAME}/ install(DIRECTORY include/${PROJECT_NAME}/
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}) DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})