fix circular dep
This commit is contained in:
parent
4f73b461fe
commit
65a0c5082f
|
@ -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
|
||||
)
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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})
|
||||
|
|
Loading…
Reference in New Issue