From 804c6627d3a688d735d5fc0e41a8bfbef5897429 Mon Sep 17 00:00:00 2001 From: matlabbe Date: Mon, 9 May 2016 16:14:21 -0400 Subject: [PATCH] removed optional libs from CATKIN_DEPENDS to avoid catkin error (catkin_package() DEPENDS on the catkin package 'costmap_2d' which must therefore be listed as a run dependency in the package.xml) --- CMakeLists.txt | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 50f81b39..93dbb2b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -105,25 +105,13 @@ generate_dynamic_reconfigure_options(cfg/Camera.cfg) ## LIBRARIES: libraries you create in this project that dependent projects also need ## CATKIN_DEPENDS: catkin_packages dependent projects also need ## DEPENDS: system dependencies of this project that dependent projects also need - -SET(optional_dependencies "") -IF(costmap_2d_FOUND) -SET(optional_dependencies ${optional_dependencies} costmap_2d ) -ENDIF(costmap_2d_FOUND) -IF(octomap_ros_FOUND) -SET(optional_dependencies ${optional_dependencies} octomap_ros) -ENDIF(octomap_ros_FOUND) -IF(rviz_FOUND) -SET(optional_dependencies ${optional_dependencies} rviz) -ENDIF(rviz_FOUND) - catkin_package( INCLUDE_DIRS include LIBRARIES rtabmap_ros CATKIN_DEPENDS cv_bridge roscpp rospy sensor_msgs std_msgs std_srvs nav_msgs geometry_msgs visualization_msgs image_transport tf tf_conversions tf2_ros eigen_conversions laser_geometry pcl_conversions pcl_ros nodelet dynamic_reconfigure message_filters class_loader - stereo_msgs move_base_msgs ${optional_dependencies} + stereo_msgs move_base_msgs DEPENDS RTABMap OpenCV )