Automated merge with https://kforge.ros.org/robotmodel/robot_model
This commit is contained in:
commit
73ac8e4d30
|
@ -8,7 +8,7 @@ rosbuild_add_library(collada_urdf src/collada_urdf.cpp)
|
||||||
rosbuild_link_boost(collada_urdf system)
|
rosbuild_link_boost(collada_urdf system)
|
||||||
|
|
||||||
rosbuild_add_executable(urdf_to_collada src/urdf_to_collada.cpp)
|
rosbuild_add_executable(urdf_to_collada src/urdf_to_collada.cpp)
|
||||||
target_link_libraries(urdf_to_collada collada_urdf assimp)
|
target_link_libraries(urdf_to_collada collada_urdf)
|
||||||
|
|
||||||
rosbuild_add_gtest(test_collada_writer test/test_collada_urdf.cpp)
|
rosbuild_add_gtest(test_collada_writer test/test_collada_urdf.cpp)
|
||||||
target_link_libraries(test_collada_writer collada_urdf assimp)
|
target_link_libraries(test_collada_writer collada_urdf)
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
<depend package="colladadom" />
|
<depend package="colladadom" />
|
||||||
<depend package="resource_retriever" />
|
<depend package="resource_retriever" />
|
||||||
<depend package="angles" />
|
<depend package="angles" />
|
||||||
<rosdep name="assimp"/>
|
<depend package="assimp"/>
|
||||||
<platform os="ubuntu" version="9.04"/>
|
<platform os="ubuntu" version="9.04"/>
|
||||||
<platform os="ubuntu" version="9.10"/>
|
<platform os="ubuntu" version="9.10"/>
|
||||||
<platform os="ubuntu" version="10.04"/>
|
<platform os="ubuntu" version="10.04"/>
|
||||||
|
|
|
@ -2,10 +2,3 @@ pcre:
|
||||||
ubuntu: libpcre3-dev
|
ubuntu: libpcre3-dev
|
||||||
fedora: pcre-devel
|
fedora: pcre-devel
|
||||||
debian: libpcre3-dev
|
debian: libpcre3-dev
|
||||||
assimp:
|
|
||||||
ubuntu: |
|
|
||||||
if [ ! -f /etc/apt/sources.list.d/openrave-release*.list ] ; then
|
|
||||||
sudo add-apt-repository ppa:openrave/release
|
|
||||||
sudo apt-get update
|
|
||||||
fi
|
|
||||||
sudo apt-get install assimp-bin assimp-dev
|
|
||||||
|
|
Loading…
Reference in New Issue