Removes deprecated Eigen cmake module. (Issue swri-robotics#245)

evenator · Sep 29, 2015 · c38c0af · c38c0af
1 parent ed2120a
commit c38c0af
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 29 deletions.
diff --git a/swri_geometry_util/CMakeLists.txt b/swri_geometry_util/CMakeLists.txt
@@ -4,14 +4,13 @@ project(swri_geometry_util)
 
 find_package(catkin REQUIRED COMPONENTS
   roscpp
-  cmake_modules
   tf
 )
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
 find_package(GEOS REQUIRED)
-find_package(Eigen REQUIRED)
-add_definitions(${EIGEN_DEFINITIONS})
+find_package(Eigen3 REQUIRED)
+add_definitions(${EIGEN3_DEFINITIONS})
 find_package(OpenCV REQUIRED)
 
 catkin_package(
@@ -22,7 +21,7 @@ catkin_package(
     tf
 )
 
-include_directories(include ${catkin_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS} ${GEOS_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS})
+include_directories(include ${catkin_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS} ${GEOS_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR})
 
 add_library(${PROJECT_NAME}
   src/intersection.cpp

diff --git a/swri_geometry_util/package.xml b/swri_geometry_util/package.xml
@@ -13,7 +13,6 @@
 
   <buildtool_depend>catkin</buildtool_depend>
 
-  <depend>cmake_modules</depend>
   <depend>eigen</depend>
   <depend>libgeos++-dev</depend>
   <depend>libopencv-dev</depend>

diff --git a/swri_image_util/CMakeLists.txt b/swri_image_util/CMakeLists.txt
@@ -2,21 +2,19 @@ cmake_minimum_required(VERSION 2.8.3)
 project(swri_image_util)
 
 find_package(catkin REQUIRED COMPONENTS 
-  roscpp
-  rospy
-  roslib
-  std_msgs
-  nodelet
+  camera_calibration_parsers
   cv_bridge
-  tf
-  cmake_modules
   geometry_msgs
   image_geometry
+  image_transport
   nav_msgs
-  camera_calibration_parsers
+  nodelet
+  roscpp
+  rospy
+  std_msgs
   swri_math_util
   swri_opencv_util
-  image_transport
+  tf
 )
 
 find_package(OpenCV)
@@ -29,33 +27,31 @@ if(${Boost_LIB_VERSION} MATCHES "1_46*")
   add_definitions( -DBOOST_1_46 )
 endif(${Boost_LIB_VERSION} MATCHES "1_46*")
 
-find_package(Eigen REQUIRED)
-add_definitions(${EIGEN_DEFINITIONS})
+find_package(Eigen3 REQUIRED)
+add_definitions(${EIGEN3_DEFINITIONS})
 
 include(${QT_USE_FILE})
 
 catkin_package(
   INCLUDE_DIRS include
   LIBRARIES ${PROJECT_NAME}
   CATKIN_DEPENDS 
-    roscpp
-    roscpp
-    rospy
-    roslib
-    std_msgs
-    nodelet
+    camera_calibration_parsers
     cv_bridge
-    tf
     geometry_msgs
     image_geometry
+    image_transport
     nav_msgs
-    camera_calibration_parsers
+    nodelet
+    roscpp
+    rospy
+    std_msgs
     swri_math_util
     swri_opencv_util
-    image_transport
+    tf
 )
 
-include_directories(include ${catkin_INCLUDE_DIRS} ${QT_INCLUDE_DIR} ${OpenCV_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
+include_directories(include ${catkin_INCLUDE_DIRS} ${QT_INCLUDE_DIR} ${OpenCV_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR} ${Boost_INCLUDE_DIRS})
 
 add_library(${PROJECT_NAME} 
   src/image_normalization.cpp 

diff --git a/swri_image_util/package.xml b/swri_image_util/package.xml
@@ -14,7 +14,6 @@
   <buildtool_depend>catkin</buildtool_depend>
 
   <depend>camera_calibration_parsers</depend>
-  <depend>cmake_modules</depend>
   <depend>cv_bridge</depend>
   <depend>eigen</depend>
   <depend>geometry_msgs</depend>
@@ -24,12 +23,11 @@
   <depend>nav_msgs</depend>
   <depend>nodelet</depend>
   <depend>roscpp</depend>
-  <depend>roslib</depend>
   <depend>rospy</depend>
   <depend>std_msgs</depend>
-  <depend>tf</depend>
   <depend>swri_math_util</depend>
   <depend>swri_opencv_util</depend>
+  <depend>tf</depend>
 
   <test_depend>rostest</test_depend>