1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Tue, 31 Jul 2018 22:46:15 +0200
Subject: Update and fix package.xml Eigen dependency
---
CMakeLists.txt | 7 +++----
package.xml | 25 +++++++++----------------
2 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 57c518c..89da515 100644
--- 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
index 31573b9..a2791cf 100644
--- 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,21 +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>
+
+ <exec_depend>python-numpy</exec_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>
-
<test_depend>rosunit</test_depend>
</package>
|
