remove catkin simple

tiesus · Nov 14, 2018 · 492c607 · 492c607
1 parent b7dcf6c
commit 492c607
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,28 +3,28 @@ project(lidar_align)
 
 add_definitions(-std=c++11 -ofast)
 
-find_package(catkin_simple REQUIRED)
-catkin_simple(ALL_DEPS_REQUIRED)
+find_package(catkin REQUIRED COMPONENTS
+  roscpp
+  image_transport
+  cv_bridge
+  pcl_ros
+  rosbag
+  sensor_msgs
+  geometry_msgs
+)
 
 find_package(nlopt REQUIRED)
 
 include_directories(
+  include
   ${nlopt_INCLUDE_DIRS}
+  ${catkin_INCLUDE_DIRS}
 )
 
-############
-# BINARIES #
-############
-add_executable(lidar_align 
+add_executable(lidar_align_node
   src/lidar_align_node.cpp
   src/sensors.cpp
   src/aligner.cpp  
   src/loader.cpp
 )
-target_link_libraries(lidar_align ${catkin_LIBRARIES} ${nlopt_LIBRARIES})
-
-##########
-# EXPORT #
-##########
-cs_install()
-cs_export()
+target_link_libraries(lidar_align_node ${catkin_LIBRARIES} ${nlopt_LIBRARIES})
diff --git a/package.xml b/package.xml
@@ -9,7 +9,6 @@
   <license>BSD</license>
 
   <buildtool_depend>catkin</buildtool_depend>
-  <buildtool_depend>catkin_simple</buildtool_depend>
 
   <depend>image_transport</depend>
   <depend>cv_bridge</depend>