Skip to content

Commit a706f34

Browse files
committed
use the new bullet and eigen conventions
git-svn-id: https://code.ros.org/svn/ros-pkg/stacks/laser_pipeline/trunk@38342 eb33c2ac-9c88-4c90-87e0-44a10359b0c3
1 parent 5c45112 commit a706f34

File tree

3 files changed

+87
-1
lines changed

3 files changed

+87
-1
lines changed

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
cmake_minimum_required(VERSION 2.4.6)
2+
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
23
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
34
rosbuild_init()
45
rosbuild_gensrv()
56

67
rosbuild_add_boost_directories()
78

9+
find_package(Eigen REQUIRED)
10+
include_directories(${EIGEN_INCLUDE_DIRS})
11+
812
rosbuild_add_executable(laser_scan_assembler_srv src/laser_scan_assembler_srv.cpp)
913
rosbuild_link_boost(laser_scan_assembler_srv system)
1014
rosbuild_add_executable(point_cloud_assembler_srv src/point_cloud_assembler_srv.cpp)

cmake/FindEigen.cmake

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
# - Try to find Eigen3 lib
2+
#
3+
# This module supports requiring a minimum version, e.g. you can do
4+
# find_package(Eigen3 3.1.2)
5+
# to require version 3.1.2 or newer of Eigen3.
6+
#
7+
# Once done this will define
8+
#
9+
# EIGEN_FOUND - system has eigen lib with correct version
10+
# EIGEN_INCLUDE_DIR - the eigen include directory
11+
# EIGEN_VERSION - eigen version
12+
13+
# Copyright (c) 2006, 2007 Montel Laurent, <[email protected]>
14+
# Copyright (c) 2008, 2009 Gael Guennebaud, <[email protected]>
15+
# Copyright (c) 2009 Benoit Jacob <[email protected]>
16+
# Redistribution and use is allowed according to the terms of the 2-clause BSD license.
17+
18+
if(NOT Eigen_FIND_VERSION)
19+
if(NOT Eigen_FIND_VERSION_MAJOR)
20+
set(Eigen_FIND_VERSION_MAJOR 2)
21+
endif(NOT Eigen_FIND_VERSION_MAJOR)
22+
if(NOT Eigen_FIND_VERSION_MINOR)
23+
set(Eigen_FIND_VERSION_MINOR 91)
24+
endif(NOT Eigen_FIND_VERSION_MINOR)
25+
if(NOT Eigen_FIND_VERSION_PATCH)
26+
set(Eigen_FIND_VERSION_PATCH 0)
27+
endif(NOT Eigen_FIND_VERSION_PATCH)
28+
29+
set(Eigen_FIND_VERSION "${Eigen_FIND_VERSION_MAJOR}.${Eigen_FIND_VERSION_MINOR}.${Eigen_FIND_VERSION_PATCH}")
30+
endif(NOT Eigen_FIND_VERSION)
31+
32+
macro(_eigen3_check_version)
33+
file(READ "${EIGEN_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen3_version_header)
34+
35+
string(REGEX MATCH "define[ \t]+EIGEN_WORLD_VERSION[ \t]+([0-9]+)" _eigen3_world_version_match "${_eigen3_version_header}")
36+
set(EIGEN_WORLD_VERSION "${CMAKE_MATCH_1}")
37+
string(REGEX MATCH "define[ \t]+EIGEN_MAJOR_VERSION[ \t]+([0-9]+)" _eigen3_major_version_match "${_eigen3_version_header}")
38+
set(EIGEN_MAJOR_VERSION "${CMAKE_MATCH_1}")
39+
string(REGEX MATCH "define[ \t]+EIGEN_MINOR_VERSION[ \t]+([0-9]+)" _eigen3_minor_version_match "${_eigen3_version_header}")
40+
set(EIGEN_MINOR_VERSION "${CMAKE_MATCH_1}")
41+
42+
set(EIGEN_VERSION ${EIGEN_WORLD_VERSION}.${EIGEN_MAJOR_VERSION}.${EIGEN_MINOR_VERSION})
43+
if(${EIGEN_VERSION} VERSION_LESS ${Eigen_FIND_VERSION})
44+
set(EIGEN_VERSION_OK FALSE)
45+
else(${EIGEN_VERSION} VERSION_LESS ${Eigen_FIND_VERSION})
46+
set(EIGEN_VERSION_OK TRUE)
47+
endif(${EIGEN_VERSION} VERSION_LESS ${Eigen_FIND_VERSION})
48+
49+
if(NOT EIGEN_VERSION_OK)
50+
51+
message(STATUS "Eigen version ${EIGEN_VERSION} found in ${EIGEN_INCLUDE_DIR}, "
52+
"but at least version ${Eigen_FIND_VERSION} is required")
53+
endif(NOT EIGEN_VERSION_OK)
54+
endmacro(_eigen3_check_version)
55+
56+
if (EIGEN_INCLUDE_DIRS)
57+
58+
# in cache already
59+
_eigen3_check_version()
60+
set(EIGEN_FOUND ${EIGEN_VERSION_OK})
61+
62+
else ()
63+
64+
find_path(EIGEN_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library
65+
PATHS
66+
${CMAKE_INSTALL_PREFIX}/include
67+
${KDE4_INCLUDE_DIR}
68+
PATH_SUFFIXES eigen3 eigen
69+
)
70+
71+
if(EIGEN_INCLUDE_DIR)
72+
_eigen3_check_version()
73+
endif(EIGEN_INCLUDE_DIR)
74+
75+
include(FindPackageHandleStandardArgs)
76+
find_package_handle_standard_args(Eigen DEFAULT_MSG EIGEN_INCLUDE_DIR EIGEN_VERSION_OK)
77+
78+
mark_as_advanced(EIGEN_INCLUDE_DIR)
79+
SET(EIGEN_INCLUDE_DIRS ${EIGEN_INCLUDE_DIR} CACHE PATH "The Eigen include path.")
80+
81+
endif()
82+

test/dummy_scan_producer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void runLoop()
5252

5353
// Configure the Transform broadcaster
5454
tf::TransformBroadcaster broadcaster;
55-
tf::Transform laser_transform(btQuaternion(0,0,0,1));
55+
tf::Transform laser_transform(tf::Quaternion(0,0,0,1));
5656

5757
// Populate the dummy laser scan
5858
sensor_msgs::LaserScan scan;

0 commit comments

Comments
 (0)