more catkin fixing

OctoMap · Dec 8, 2012 · 95df0d8 · 95df0d8
1 parent 8610b56
commit 95df0d8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,27 +1,22 @@
 cmake_minimum_required(VERSION 2.8)
 project(octomap_ros)
-find_package(catkin)
+
+find_package(catkin REQUIRED COMPONENTS sensor_msgs tf pcl_ros octomap_msgs)
+find_package(octomap REQUIRED)
 
 catkin_package(
   INCLUDE_DIRS include
   LIBRARIES ${PROJECT_NAME}
   DEPENDS sensor_msgs tf pcl_ros octomap_msgs)
 
-find_package(catkin REQUIRED sensor_msgs tf pcl_ros octomap_msgs)
 include_directories(${catkin_INCLUDE_DIRS})
 link_directories(${catkin_LIBRARY_DIRS})
 link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES})
 
-find_package(octomap REQUIRED)
 include_directories(${octomap_INCLUDE_DIRS})
 link_directories(${octomap_LIBRARY_DIRS})
 link_libraries(${PROJECT_NAME} ${octomap_LIBRARIES})
 
-find_package(PCL REQUIRED)
-include_directories(${PCL_INCLUDE_DIRS})
-link_directories(${PCL_LIBRARY_DIRS})
-link_libraries(${PROJECT_NAME} ${PCL_LIBRARIES})
-
 include_directories(include)
 include_directories(include ${catkin_INCLUDE_DIRS})
 

diff --git a/package.xml b/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>octomap_ros</name>
-  <version>0.2.4</version>
+  <version>0.2.5</version>
   <description>
     octomap_ros provides conversion functions between ROS / PCL and OctoMap's native types.
     This enables a convenvient use of the octomap package in ROS.