Update and fix package.xml Eigen dependency

audrow · Jul 31, 2018 · e37c6ef · e37c6ef
1 parent e1dbfe1
commit e37c6ef
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 21 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,6 @@ project(laser_geometry)
 find_package(catkin REQUIRED
     COMPONENTS
         angles
-        cmake_modules
         roscpp
         sensor_msgs
         tf
@@ -13,20 +12,20 @@ find_package(catkin REQUIRED
 
 find_package(Boost REQUIRED COMPONENTS system thread)
 
-find_package(Eigen REQUIRED)
+find_package(Eigen3 REQUIRED)
 
 catkin_python_setup()
 
 catkin_package(
   INCLUDE_DIRS include
   LIBRARIES laser_geometry
-  DEPENDS Boost Eigen
+  DEPENDS Boost EIGEN3
 )
 
 include_directories(include
     ${catkin_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
-    ${Eigen_INCLUDE_DIRS}
+    ${EIGEN3_INCLUDE_DIR}
 )
 
 add_library(laser_geometry src/laser_geometry.cpp)

diff --git a/package.xml b/package.xml
@@ -1,4 +1,4 @@
-<package>
+<package format="2">
   <name>laser_geometry</name>
   <version>1.6.4</version>
   <description>
@@ -18,23 +18,14 @@
 
   <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
 
-  <build_depend>angles</build_depend>
-  <build_depend>boost</build_depend>
-  <build_depend>cmake_modules</build_depend>
-  <build_depend>eigen</build_depend>
-  <build_depend>roscpp</build_depend>
-  <build_depend>sensor_msgs</build_depend>
-  <build_depend>tf</build_depend>
+  <depend>angles</depend>
+  <depend>boost</depend>
+  <depend>eigen</depend>
+  <depend>roscpp</depend>
+  <depend>sensor_msgs</depend>
+  <depend>tf</depend>
 
-  <run_depend>angles</run_depend>
-  <run_depend>boost</run_depend>
-  <run_depend>eigen</run_depend>
-  <run_depend>python-numpy</run_depend>
-  <run_depend>roscpp</run_depend>
-  <run_depend>sensor_msgs</run_depend>
-  <run_depend>tf</run_depend>
+  <exec_depend>python-numpy</exec_depend>
 
-  <build_export_depend>eigen</build_export_depend>
-
   <test_depend>rosunit</test_depend>
 </package>