Merge pull request #36 from YoheiKakiuchi/hydro-devel
fix for compiling collada_to_urdf, add dependency to tf
This commit is contained in:
commit
f61b2c699a
|
@ -1,14 +1,14 @@
|
||||||
cmake_minimum_required(VERSION 2.8.3)
|
cmake_minimum_required(VERSION 2.8.3)
|
||||||
project(collada_urdf)
|
project(collada_urdf)
|
||||||
|
|
||||||
find_package(catkin REQUIRED COMPONENTS angles collada_parser resource_retriever urdf geometric_shapes cmake_modules)
|
find_package(catkin REQUIRED COMPONENTS angles collada_parser resource_retriever urdf geometric_shapes tf cmake_modules)
|
||||||
|
|
||||||
find_package(TinyXML REQUIRED)
|
find_package(TinyXML REQUIRED)
|
||||||
|
|
||||||
catkin_package(
|
catkin_package(
|
||||||
LIBRARIES ${PROJECT_NAME}
|
LIBRARIES ${PROJECT_NAME}
|
||||||
INCLUDE_DIRS include
|
INCLUDE_DIRS include
|
||||||
DEPENDS angles collada_parser resource_retriever urdf)
|
DEPENDS angles collada_parser resource_retriever urdf geometric_shapes tf)
|
||||||
|
|
||||||
include_directories(include)
|
include_directories(include)
|
||||||
|
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
<build_depend>urdfdom</build_depend>
|
<build_depend>urdfdom</build_depend>
|
||||||
<build_depend>urdfdom_headers</build_depend>
|
<build_depend>urdfdom_headers</build_depend>
|
||||||
<build_depend>geometric_shapes</build_depend>
|
<build_depend>geometric_shapes</build_depend>
|
||||||
|
<build_depend>tf</build_depend>
|
||||||
<build_depend>cmake_modules</build_depend>
|
<build_depend>cmake_modules</build_depend>
|
||||||
|
|
||||||
<run_depend>angles</run_depend>
|
<run_depend>angles</run_depend>
|
||||||
|
@ -39,6 +40,7 @@
|
||||||
<run_depend>urdf</run_depend>
|
<run_depend>urdf</run_depend>
|
||||||
<run_depend>urdfdom</run_depend>
|
<run_depend>urdfdom</run_depend>
|
||||||
<run_depend>urdfdom_headers</run_depend>
|
<run_depend>urdfdom_headers</run_depend>
|
||||||
|
<run_depend>tf</run_depend>
|
||||||
<run_depend>geometric_shapes</run_depend>
|
<run_depend>geometric_shapes</run_depend>
|
||||||
|
|
||||||
</package>
|
</package>
|
||||||
|
|
Loading…
Reference in New Issue