Merge branch 'TAMS-Group:master' into master

mechwiz · web-flow · commit ac29b10dbcab · 2023-01-25T20:07:45.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,6 +16,7 @@ find_package(catkin REQUIRED COMPONENTS
   tf2_eigen
   tf2_kdl
   tf2_geometry_msgs
+  tf_conversions
 )
 
 find_package(OpenMP)
diff --git a/bio_ik_kinematics_description.xml b/bio_ik_kinematics_description.xml
@@ -1,4 +1,4 @@
-<library path="lib/libbio_ik">
+<library path="libbio_ik">
     <class name="bio_ik/BioIKKinematicsPlugin" type="bio_ik_kinematics_plugin::BioIKKinematicsPlugin" base_class_type="kinematics::KinematicsBase">
     </class>
 </library>

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ find_package(catkin REQUIRED COMPONENTS`
`16`	`16`	`tf2_eigen`
`17`	`17`	`tf2_kdl`
`18`	`18`	`tf2_geometry_msgs`
	`19`	`+ tf_conversions`
`19`	`20`	`)`
`20`	`21`
`21`	`22`	`find_package(OpenMP)`