From 2cae3bc6dd0ec3f0d085962b83f6937caa59579b Mon Sep 17 00:00:00 2001
From: egiljones <egiljones@253336fb-580f-4252-a368-f3cef5a2a82b>
Date: Wed, 11 Jan 2012 23:13:41 +0000
Subject: [PATCH] Moving dependency on assimp to rosdep and an explicit link
into the library
git-svn-id: https://kforge.ros.org/fcl/fcl_ros@64 253336fb-580f-4252-a368-f3cef5a2a82b
---
trunk/fcl/CMakeLists.txt | 1 +
trunk/fcl/manifest.xml | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/trunk/fcl/CMakeLists.txt b/trunk/fcl/CMakeLists.txt
index c5bebf08..7e6f93e2 100644
--- a/trunk/fcl/CMakeLists.txt
+++ b/trunk/fcl/CMakeLists.txt
@@ -33,6 +33,7 @@ add_definitions(-DUSE_PQP=1)
add_definitions(-DUSE_SVMLIGHT=0)
rosbuild_add_library(${PROJECT_NAME} src/AABB.cpp src/OBB.cpp src/RSS.cpp src/vec_3f.cpp src/traversal_node_base.cpp src/traversal_node_bvhs.cpp src/intersect.cpp src/motion.cpp src/BV_fitter.cpp src/BV_splitter.cpp src/BVH_model.cpp src/BVH_utility.cpp src/transform.cpp src/simple_setup.cpp src/geometric_shapes.cpp src/geometric_shapes_utility.cpp src/geometric_shapes_intersect.cpp src/collision_node.cpp src/traversal_recurse.cpp src/broad_phase_collision.cpp src/collision.cpp src/collision_func_matrix.cpp src/interval_tree.cpp src/conservative_advancement.cpp src/matrix_3f.cpp src/interval.cpp src/interval_vector.cpp src/interval_matrix.cpp src/taylor_model.cpp src/taylor_vector.cpp src/taylor_matrix.cpp)
+target_link_libraries(fcl assimp)
rosbuild_add_gtest(test_core_collision test/test_core_collision.cpp)
target_link_libraries(test_core_collision fcl)
diff --git a/trunk/fcl/manifest.xml b/trunk/fcl/manifest.xml
index 97efe507..3e25e7ef 100644
--- a/trunk/fcl/manifest.xml
+++ b/trunk/fcl/manifest.xml
@@ -10,9 +10,12 @@
<url>http://ros.org/wiki/fcl</url>
<depend package="libccd"/>
<depend package="ann"/>
- <depend package="assimp"/>
<depend package="PQP"/>
<!-- <depend package="svm_light"/> -->
+ <depend package="common_rosdeps"/>
+
+ <rosdep name="assimp"/>
+
<export>
<cpp cflags="-I${prefix}/include" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lfcl"/>
</export>
--
GitLab