Skip to content

Commit 4eb9337

Browse files
committed
Require Eigen 3.2 Exact (Eigen 3.3+ not supported yet)
Removed OpenCV dependency
1 parent 50012e8 commit 4eb9337

File tree

3 files changed

+91
-99
lines changed

3 files changed

+91
-99
lines changed

CMakeLists.txt

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
cmake_minimum_required(VERSION 2.8.3)
22
project(dbot_ros)
33

4-
############################
5-
# Options #
6-
############################
7-
84
############################
95
# Flags #
106
############################
@@ -54,12 +50,13 @@ set(PROJECT_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
5450
set(CMAKE_MODULE_PATH ${PROJECT_MODULE_PATH})
5551

5652
find_package(Boost REQUIRED)
57-
find_package(Eigen REQUIRED)
58-
find_package(OpenCV REQUIRED)
59-
6053
include_directories(${Boost_INCLUDE_DIRS})
61-
include_directories(${Eigen_INCLUDE_DIRS})
62-
include_directories(${OpenCV_INCLUDE_DIRS})
54+
55+
find_package(Eigen3 3.2 EXACT REQUIRED)
56+
include_directories(${EIGEN3_INCLUDE_DIR})
57+
58+
# find_package(OpenCV REQUIRED)
59+
# include_directories(${OpenCV_INCLUDE_DIRS})
6360

6461
###################################
6562
## catkin specific configuration ##
@@ -82,9 +79,7 @@ catkin_package(
8279
dbot
8380
dbot_ros_msgs
8481
interactive_markers
85-
DEPENDS
86-
OpenCV
87-
eigen)
82+
)
8883

8984
###########
9085
## Build ##
@@ -116,7 +111,7 @@ add_dependencies(${PROJECT_NAME}
116111

117112
target_link_libraries(${PROJECT_NAME}
118113
${catkin_LIBRARIES}
119-
${OpenCV_LIBRARIES})
114+
)
120115

121116
add_executable(particle_tracker
122117
source/${PROJECT_NAME}/tracker/particle_tracker_node.cpp)
@@ -125,7 +120,6 @@ add_dependencies(particle_tracker
125120
target_link_libraries(particle_tracker
126121
${PROJECT_NAME}
127122
${catkin_LIBRARIES}
128-
${OpenCV_LIBS}
129123
${PCL_LIBRARIES}
130124
yaml-cpp)
131125

@@ -136,7 +130,6 @@ add_dependencies(gaussian_tracker
136130
target_link_libraries(gaussian_tracker
137131
${PROJECT_NAME}
138132
${catkin_LIBRARIES}
139-
${OpenCV_LIBS}
140133
${PCL_LIBRARIES}
141134
yaml-cpp)
142135

@@ -147,7 +140,6 @@ add_dependencies(object_tracker_service
147140
target_link_libraries(object_tracker_service
148141
${PROJECT_NAME}
149142
${catkin_LIBRARIES}
150-
${OpenCV_LIBS}
151143
${PCL_LIBRARIES}
152144
yaml-cpp)
153145

@@ -158,7 +150,6 @@ add_dependencies(object_tracker_controller_service
158150
target_link_libraries(object_tracker_controller_service
159151
${PROJECT_NAME}
160152
${catkin_LIBRARIES}
161-
${OpenCV_LIBS}
162153
${PCL_LIBRARIES}
163154
yaml-cpp)
164155

@@ -168,5 +159,6 @@ add_executable(
168159
target_link_libraries(
169160
interactive_markers_initializer_node
170161
${PROJECT_NAME}
171-
${catkin_LIBRARIES})
162+
${catkin_LIBRARIES}
163+
)
172164

cmake/FindEigen.cmake

Lines changed: 0 additions & 81 deletions
This file was deleted.

cmake/FindEigen3.cmake

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
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+
# EIGEN3_FOUND - system has eigen lib with correct version
10+
# EIGEN3_INCLUDE_DIR - the eigen include directory
11+
# EIGEN3_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 Eigen3_FIND_VERSION)
19+
if(NOT Eigen3_FIND_VERSION_MAJOR)
20+
set(Eigen3_FIND_VERSION_MAJOR 2)
21+
endif(NOT Eigen3_FIND_VERSION_MAJOR)
22+
if(NOT Eigen3_FIND_VERSION_MINOR)
23+
set(Eigen3_FIND_VERSION_MINOR 91)
24+
endif(NOT Eigen3_FIND_VERSION_MINOR)
25+
if(NOT Eigen3_FIND_VERSION_PATCH)
26+
set(Eigen3_FIND_VERSION_PATCH 0)
27+
endif(NOT Eigen3_FIND_VERSION_PATCH)
28+
29+
set(Eigen3_FIND_VERSION "${Eigen3_FIND_VERSION_MAJOR}.${Eigen3_FIND_VERSION_MINOR}.${Eigen3_FIND_VERSION_PATCH}")
30+
endif(NOT Eigen3_FIND_VERSION)
31+
32+
macro(_eigen3_check_version)
33+
file(READ "${EIGEN3_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(EIGEN3_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(EIGEN3_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(EIGEN3_MINOR_VERSION "${CMAKE_MATCH_1}")
41+
42+
set(EIGEN3_VERSION ${EIGEN3_WORLD_VERSION}.${EIGEN3_MAJOR_VERSION}.${EIGEN3_MINOR_VERSION})
43+
if(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
44+
set(EIGEN3_VERSION_OK FALSE)
45+
else(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
46+
set(EIGEN3_VERSION_OK TRUE)
47+
endif(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
48+
49+
if(NOT EIGEN3_VERSION_OK)
50+
51+
message(STATUS "Eigen3 version ${EIGEN3_VERSION} found in ${EIGEN3_INCLUDE_DIR}, "
52+
"but at least version ${Eigen3_FIND_VERSION} is required")
53+
endif(NOT EIGEN3_VERSION_OK)
54+
endmacro(_eigen3_check_version)
55+
56+
if (EIGEN3_INCLUDE_DIR)
57+
58+
# in cache already
59+
_eigen3_check_version()
60+
set(EIGEN3_FOUND ${EIGEN3_VERSION_OK})
61+
62+
else (EIGEN3_INCLUDE_DIR)
63+
64+
find_path(EIGEN3_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(EIGEN3_INCLUDE_DIR)
72+
_eigen3_check_version()
73+
endif(EIGEN3_INCLUDE_DIR)
74+
75+
include(FindPackageHandleStandardArgs)
76+
find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIR EIGEN3_VERSION_OK)
77+
78+
mark_as_advanced(EIGEN3_INCLUDE_DIR)
79+
80+
endif(EIGEN3_INCLUDE_DIR)
81+

0 commit comments

Comments
 (0)