From 11d4431f4ca5e8983412d26db4d2c9b8e147a80d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20G=C3=BCnther?= Date: Mon, 31 Jul 2017 23:45:26 +0200 Subject: [PATCH] Fix CMakeLists + package.xmls (#548) * Fix CMakeLists + package.xmls This fixes compilation errors when rosjava is installed on the system. It also removes a lot of errors reported by catkin_lint. Fixes #537 . * Fix more CMakeLists.txt + package.xmls * amcl: disambiguate include path This fixes the following catkin_lint warning: amcl: warning: include paths 'include/amcl/map' and 'include' are ambiguous * You have used two include paths where one is a parent of the * other. Thus the same headers can be included with two different * include paths which may confuse users. It is recommended that * you keep your include paths consistent. --- amcl/CMakeLists.txt | 7 ++++-- amcl/package.xml | 3 ++- amcl/src/amcl/map/map.c | 2 +- amcl/src/amcl/map/map_cspace.cpp | 2 +- amcl/src/amcl/map/map_draw.c | 2 +- amcl/src/amcl/map/map_range.c | 2 +- amcl/src/amcl/map/map_store.c | 2 +- amcl/src/amcl/pf/pf.c | 6 ++--- amcl/src/amcl/pf/pf_kdtree.c | 4 +-- amcl/src/amcl/pf/pf_pdf.c | 2 +- amcl/src/amcl/pf/pf_vector.c | 4 +-- amcl/src/amcl/sensors/amcl_laser.cpp | 2 +- amcl/src/amcl/sensors/amcl_odom.cpp | 2 +- amcl/src/amcl/sensors/amcl_sensor.cpp | 2 +- amcl/src/amcl_node.cpp | 8 +++--- base_local_planner/CMakeLists.txt | 35 +++++++++++++++++---------- base_local_planner/package.xml | 8 +++--- carrot_planner/CMakeLists.txt | 1 + clear_costmap_recovery/CMakeLists.txt | 4 +-- clear_costmap_recovery/package.xml | 2 ++ costmap_2d/CMakeLists.txt | 17 ++++--------- costmap_2d/package.xml | 4 +-- dwa_local_planner/CMakeLists.txt | 6 ++--- fake_localization/CMakeLists.txt | 15 ++++++------ global_planner/CMakeLists.txt | 4 +-- map_server/CMakeLists.txt | 7 ++++-- map_server/package.xml | 4 +-- move_base/CMakeLists.txt | 23 +++++++++++++----- move_base/package.xml | 6 ----- move_slow_and_clear/CMakeLists.txt | 14 +++++------ navfn/CMakeLists.txt | 10 +++++--- navfn/package.xml | 2 ++ robot_pose_ekf/CMakeLists.txt | 11 +++++++-- robot_pose_ekf/package.xml | 5 ++-- rotate_recovery/CMakeLists.txt | 6 +++++ voxel_grid/CMakeLists.txt | 1 + voxel_grid/package.xml | 2 ++ 37 files changed, 136 insertions(+), 101 deletions(-) diff --git a/amcl/CMakeLists.txt b/amcl/CMakeLists.txt index 79b454dc40..72a2a60b49 100644 --- a/amcl/CMakeLists.txt +++ b/amcl/CMakeLists.txt @@ -3,8 +3,10 @@ project(amcl) find_package(catkin REQUIRED COMPONENTS + message_filters rosbag roscpp + std_srvs tf dynamic_reconfigure nav_msgs @@ -24,11 +26,12 @@ catkin_package( roscpp dynamic_reconfigure tf + CATKIN_DEPENDS nav_msgs std_srvs INCLUDE_DIRS include LIBRARIES amcl_sensors amcl_map amcl_pf ) -include_directories(include/amcl include/amcl/map include/amcl/sensors include/amcl/pf) +include_directories(include) include_directories(${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}) add_library(amcl_pf @@ -55,7 +58,7 @@ target_link_libraries(amcl_sensors amcl_map amcl_pf) add_executable(amcl src/amcl_node.cpp) -add_dependencies(amcl amcl_gencfg) +add_dependencies(amcl ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) target_link_libraries(amcl amcl_sensors amcl_map amcl_pf diff --git a/amcl/package.xml b/amcl/package.xml index 85b7b764d3..e317eb45a0 100644 --- a/amcl/package.xml +++ b/amcl/package.xml @@ -27,7 +27,6 @@ message_filters nav_msgs roscpp - rostest std_srvs tf @@ -36,6 +35,8 @@ dynamic_reconfigure tf nav_msgs + std_srvs + rostest map_server diff --git a/amcl/src/amcl/map/map.c b/amcl/src/amcl/map/map.c index 970f3395d4..23c96625b0 100644 --- a/amcl/src/amcl/map/map.c +++ b/amcl/src/amcl/map/map.c @@ -31,7 +31,7 @@ #include #include -#include "map.h" +#include "amcl/map/map.h" // Create a new map diff --git a/amcl/src/amcl/map/map_cspace.cpp b/amcl/src/amcl/map/map_cspace.cpp index 5b4cf9ccfe..0667864500 100644 --- a/amcl/src/amcl/map/map_cspace.cpp +++ b/amcl/src/amcl/map/map_cspace.cpp @@ -23,7 +23,7 @@ #include #include #include -#include "map.h" +#include "amcl/map/map.h" class CellData { diff --git a/amcl/src/amcl/map/map_draw.c b/amcl/src/amcl/map/map_draw.c index 49ed32765f..b1201fd413 100644 --- a/amcl/src/amcl/map/map_draw.c +++ b/amcl/src/amcl/map/map_draw.c @@ -33,7 +33,7 @@ #include #include -#include "map.h" +#include "amcl/map/map.h" //////////////////////////////////////////////////////////////////////////// diff --git a/amcl/src/amcl/map/map_range.c b/amcl/src/amcl/map/map_range.c index 1003cf98b1..658619f43d 100644 --- a/amcl/src/amcl/map/map_range.c +++ b/amcl/src/amcl/map/map_range.c @@ -30,7 +30,7 @@ #include #include -#include "map.h" +#include "amcl/map/map.h" // Extract a single range reading from the map. Unknown cells and/or // out-of-bound cells are treated as occupied, which makes it easy to diff --git a/amcl/src/amcl/map/map_store.c b/amcl/src/amcl/map/map_store.c index 5bf7afad95..b6d6ddb5b5 100644 --- a/amcl/src/amcl/map/map_store.c +++ b/amcl/src/amcl/map/map_store.c @@ -31,7 +31,7 @@ #include #include -#include "map.h" +#include "amcl/map/map.h" //////////////////////////////////////////////////////////////////////////// diff --git a/amcl/src/amcl/pf/pf.c b/amcl/src/amcl/pf/pf.c index d0ea85eade..b777c0aabb 100644 --- a/amcl/src/amcl/pf/pf.c +++ b/amcl/src/amcl/pf/pf.c @@ -30,9 +30,9 @@ #include #include -#include "pf.h" -#include "pf_pdf.h" -#include "pf_kdtree.h" +#include "amcl/pf/pf.h" +#include "amcl/pf/pf_pdf.h" +#include "amcl/pf/pf_kdtree.h" // Compute the required number of samples, given that there are k bins diff --git a/amcl/src/amcl/pf/pf_kdtree.c b/amcl/src/amcl/pf/pf_kdtree.c index 20b3c69473..b625b83310 100644 --- a/amcl/src/amcl/pf/pf_kdtree.c +++ b/amcl/src/amcl/pf/pf_kdtree.c @@ -31,8 +31,8 @@ #include -#include "pf_vector.h" -#include "pf_kdtree.h" +#include "amcl/pf/pf_vector.h" +#include "amcl/pf/pf_kdtree.h" // Compare keys to see if they are equal diff --git a/amcl/src/amcl/pf/pf_pdf.c b/amcl/src/amcl/pf/pf_pdf.c index 6748a00928..e6130cf5c1 100644 --- a/amcl/src/amcl/pf/pf_pdf.c +++ b/amcl/src/amcl/pf/pf_pdf.c @@ -32,7 +32,7 @@ //#include //#include -#include "pf_pdf.h" +#include "amcl/pf/pf_pdf.h" // Random number generator seed value static unsigned int pf_pdf_seed; diff --git a/amcl/src/amcl/pf/pf_vector.c b/amcl/src/amcl/pf/pf_vector.c index 1cdb57369c..80c6fb8fc2 100644 --- a/amcl/src/amcl/pf/pf_vector.c +++ b/amcl/src/amcl/pf/pf_vector.c @@ -30,8 +30,8 @@ //#include //#include -#include "pf_vector.h" -#include "eig3.h" +#include "amcl/pf/pf_vector.h" +#include "amcl/pf/eig3.h" // Return a zero vector diff --git a/amcl/src/amcl/sensors/amcl_laser.cpp b/amcl/src/amcl/sensors/amcl_laser.cpp index 923e4c7797..fe5ad521dd 100644 --- a/amcl/src/amcl/sensors/amcl_laser.cpp +++ b/amcl/src/amcl/sensors/amcl_laser.cpp @@ -33,7 +33,7 @@ #include #include -#include "amcl_laser.h" +#include "amcl/sensors/amcl_laser.h" using namespace amcl; diff --git a/amcl/src/amcl/sensors/amcl_odom.cpp b/amcl/src/amcl/sensors/amcl_odom.cpp index 2a1921b724..80b95a501e 100644 --- a/amcl/src/amcl/sensors/amcl_odom.cpp +++ b/amcl/src/amcl/sensors/amcl_odom.cpp @@ -32,7 +32,7 @@ #include // required by Darwin #include -#include "amcl_odom.h" +#include "amcl/sensors/amcl_odom.h" using namespace amcl; diff --git a/amcl/src/amcl/sensors/amcl_sensor.cpp b/amcl/src/amcl/sensors/amcl_sensor.cpp index 1c95993918..48e190d6fa 100644 --- a/amcl/src/amcl/sensors/amcl_sensor.cpp +++ b/amcl/src/amcl/sensors/amcl_sensor.cpp @@ -28,7 +28,7 @@ /////////////////////////////////////////////////////////////////////////// -#include "amcl_sensor.h" +#include "amcl/sensors/amcl_sensor.h" using namespace amcl; diff --git a/amcl/src/amcl_node.cpp b/amcl/src/amcl_node.cpp index d05d92936a..8a344dd549 100644 --- a/amcl/src/amcl_node.cpp +++ b/amcl/src/amcl_node.cpp @@ -31,10 +31,10 @@ // Signal handling #include -#include "map/map.h" -#include "pf/pf.h" -#include "sensors/amcl_odom.h" -#include "sensors/amcl_laser.h" +#include "amcl/map/map.h" +#include "amcl/pf/pf.h" +#include "amcl/sensors/amcl_odom.h" +#include "amcl/sensors/amcl_laser.h" #include "ros/assert.h" diff --git a/base_local_planner/CMakeLists.txt b/base_local_planner/CMakeLists.txt index 507af18aa2..cbd442bfcf 100644 --- a/base_local_planner/CMakeLists.txt +++ b/base_local_planner/CMakeLists.txt @@ -3,16 +3,22 @@ project(base_local_planner) find_package(catkin REQUIRED COMPONENTS + angles cmake_modules - roscpp - tf - message_generation + costmap_2d dynamic_reconfigure + geometry_msgs + message_generation nav_core + nav_msgs pcl_conversions - costmap_2d + pcl_ros pluginlib - angles + roscpp + rospy + std_msgs + tf + voxel_grid ) find_package(Boost REQUIRED @@ -56,14 +62,17 @@ catkin_package( base_local_planner trajectory_planner_ros CATKIN_DEPENDS - roscpp - dynamic_reconfigure - message_generation - tf - pluginlib + angles costmap_2d + dynamic_reconfigure + geometry_msgs + message_runtime nav_core - angles + nav_msgs + pluginlib + roscpp + std_msgs + tf ) #uncomment for profiling @@ -104,11 +113,12 @@ target_link_libraries(base_local_planner add_library(trajectory_planner_ros src/trajectory_planner.cpp src/trajectory_planner_ros.cpp) -add_dependencies(trajectory_planner_ros nav_msgs_generate_messages_cpp) +add_dependencies(trajectory_planner_ros ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) target_link_libraries(trajectory_planner_ros base_local_planner) add_executable(point_grid src/point_grid.cpp) +add_dependencies(point_grid ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) target_link_libraries(point_grid ${catkin_LIBRARIES}) install(TARGETS @@ -140,7 +150,6 @@ if(CATKIN_ENABLE_TESTING) base_local_planner trajectory_planner_ros ) - catkin_add_gtest(line_iterator test/line_iterator_test.cpp) endif() diff --git a/base_local_planner/package.xml b/base_local_planner/package.xml index 2b78d37c2e..abd3d1dbd5 100644 --- a/base_local_planner/package.xml +++ b/base_local_planner/package.xml @@ -19,7 +19,6 @@ cmake_modules std_msgs nav_msgs - rosconsole roscpp tf rospy @@ -27,7 +26,6 @@ costmap_2d voxel_grid angles - visualization_msgs geometry_msgs nav_core pcl_conversions @@ -38,7 +36,6 @@ std_msgs nav_msgs - rosconsole roscpp tf rospy @@ -46,13 +43,14 @@ costmap_2d voxel_grid angles - visualization_msgs geometry_msgs nav_core pcl_ros eigen dynamic_reconfigure - message_generation + message_runtime + + rosunit diff --git a/carrot_planner/CMakeLists.txt b/carrot_planner/CMakeLists.txt index c06cc9fbf2..8a4601bd0d 100644 --- a/carrot_planner/CMakeLists.txt +++ b/carrot_planner/CMakeLists.txt @@ -29,6 +29,7 @@ catkin_package( ) add_library(carrot_planner src/carrot_planner.cpp) +add_dependencies(carrot_planner ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) target_link_libraries(carrot_planner ${catkin_LIBRARIES} ) diff --git a/clear_costmap_recovery/CMakeLists.txt b/clear_costmap_recovery/CMakeLists.txt index 2486f880b3..928899936b 100644 --- a/clear_costmap_recovery/CMakeLists.txt +++ b/clear_costmap_recovery/CMakeLists.txt @@ -34,6 +34,7 @@ catkin_package( ) add_library(clear_costmap_recovery src/clear_costmap_recovery.cpp) +add_dependencies(clear_costmap_recovery ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) target_link_libraries(clear_costmap_recovery ${catkin_LIBRARIES}) @@ -45,9 +46,6 @@ if(CATKIN_ENABLE_TESTING) # Add the test folder to the include directories include_directories(test) - include_directories(${GTEST_INCLUDE_DIRS}) - link_directories(${GTEST_LIBRARY_DIRS}) - # Create targets for test executables add_rostest_gtest(clear_tester test/clear_tests.launch test/clear_tester.cpp) target_link_libraries(clear_tester clear_costmap_recovery ${GTEST_LIBRARIES}) diff --git a/clear_costmap_recovery/package.xml b/clear_costmap_recovery/package.xml index a6b8095b6b..f4195c13ec 100644 --- a/clear_costmap_recovery/package.xml +++ b/clear_costmap_recovery/package.xml @@ -30,6 +30,8 @@ pluginlib eigen + rostest + diff --git a/costmap_2d/CMakeLists.txt b/costmap_2d/CMakeLists.txt index c05ddb2796..d6215943ac 100644 --- a/costmap_2d/CMakeLists.txt +++ b/costmap_2d/CMakeLists.txt @@ -62,8 +62,6 @@ generate_dynamic_reconfigure_options( catkin_package( INCLUDE_DIRS include - ${EIGEN3_INCLUDE_DIRS} - ${PCL_INCLUDE_DIRS} LIBRARIES costmap_2d layers CATKIN_DEPENDS dynamic_reconfigure @@ -99,7 +97,7 @@ add_library(costmap_2d src/footprint.cpp src/costmap_layer.cpp ) -add_dependencies(costmap_2d geometry_msgs_generate_messages_cpp) +add_dependencies(costmap_2d ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) target_link_libraries(costmap_2d ${PCL_LIBRARIES} ${Boost_LIBRARIES} @@ -113,27 +111,25 @@ add_library(layers plugins/voxel_layer.cpp src/observation_buffer.cpp ) +add_dependencies(layers ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) target_link_libraries(layers costmap_2d ) -add_dependencies(costmap_2d costmap_2d_gencfg) -add_dependencies(layers costmap_2d_gencfg) -add_dependencies(costmap_2d costmap_2d_generate_messages_cpp) - add_executable(costmap_2d_markers src/costmap_2d_markers.cpp) -add_dependencies(costmap_2d_markers visualization_msgs_generate_messages_cpp) +add_dependencies(costmap_2d_markers ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) target_link_libraries(costmap_2d_markers costmap_2d ) add_executable(costmap_2d_cloud src/costmap_2d_cloud.cpp) -add_dependencies(costmap_2d_cloud sensor_msgs_generate_messages_cpp) +add_dependencies(costmap_2d_cloud ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) target_link_libraries(costmap_2d_cloud costmap_2d ) add_executable(costmap_2d_node src/costmap_2d_node.cpp) +add_dependencies(costmap_2d_node ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) target_link_libraries(costmap_2d_node costmap_2d ) @@ -146,9 +142,6 @@ if(CATKIN_ENABLE_TESTING) # Add the test folder to the include directories include_directories(test) - include_directories(${GTEST_INCLUDE_DIRS}) - link_directories(${GTEST_LIBRARY_DIRS}) - # Create targets for test executables add_executable(costmap_tester EXCLUDE_FROM_ALL test/costmap_tester.cpp) add_dependencies(tests costmap_tester) diff --git a/costmap_2d/package.xml b/costmap_2d/package.xml index 84a47bfa5e..c819eb33fa 100644 --- a/costmap_2d/package.xml +++ b/costmap_2d/package.xml @@ -33,7 +33,6 @@ pcl_ros pluginlib roscpp - rostest sensor_msgs std_msgs tf @@ -52,7 +51,6 @@ pluginlib rosconsole roscpp - rostest sensor_msgs std_msgs tf @@ -61,6 +59,8 @@ map_server rosbag + rostest + rosunit diff --git a/dwa_local_planner/CMakeLists.txt b/dwa_local_planner/CMakeLists.txt index 99c41592d5..fcc9faf654 100644 --- a/dwa_local_planner/CMakeLists.txt +++ b/dwa_local_planner/CMakeLists.txt @@ -26,8 +26,6 @@ include_directories( ) add_definitions(${EIGEN3_DEFINITIONS}) -link_directories(${catkin_LIBRARY_DIRS}) - # dynamic reconfigure generate_dynamic_reconfigure_options( cfg/DWAPlanner.cfg @@ -38,14 +36,14 @@ catkin_package( LIBRARIES dwa_local_planner CATKIN_DEPENDS dynamic_reconfigure + nav_msgs pluginlib roscpp ) add_library(dwa_local_planner src/dwa_planner.cpp src/dwa_planner_ros.cpp) +add_dependencies(dwa_local_planner ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) target_link_libraries(dwa_local_planner ${catkin_LIBRARIES}) -add_dependencies(dwa_local_planner dwa_local_planner_gencfg) -add_dependencies(dwa_local_planner nav_msgs_generate_messages_cpp) install(TARGETS dwa_local_planner ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} diff --git a/fake_localization/CMakeLists.txt b/fake_localization/CMakeLists.txt index 12d2b7a226..6e8bca8faf 100644 --- a/fake_localization/CMakeLists.txt +++ b/fake_localization/CMakeLists.txt @@ -4,12 +4,13 @@ project(fake_localization) find_package(catkin REQUIRED COMPONENTS angles - roscpp - rosconsole - nav_msgs geometry_msgs - tf message_filters + nav_msgs + rosconsole + roscpp + rospy + tf ) @@ -17,6 +18,8 @@ find_package(Boost REQUIRED COMPONENTS signals) catkin_package( CATKIN_DEPENDS + geometry_msgs + nav_msgs roscpp rospy ) @@ -28,9 +31,7 @@ target_link_libraries(fake_localization ${catkin_LIBRARIES} ${Boost_LIBRARIES} ) - -add_dependencies(fake_localization nav_msgs_generate_messages_cpp) -add_dependencies(fake_localization geometry_msgs_generate_messages_cpp) +add_dependencies(fake_localization ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) install( PROGRAMS diff --git a/global_planner/CMakeLists.txt b/global_planner/CMakeLists.txt index 8750949532..5d0201ccac 100644 --- a/global_planner/CMakeLists.txt +++ b/global_planner/CMakeLists.txt @@ -48,13 +48,13 @@ add_library(${PROJECT_NAME} src/orientation_filter.cpp src/planner_core.cpp ) +add_dependencies(${PROJECT_NAME} ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES}) -add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_gencfg) - add_executable(planner src/plan_node.cpp ) +add_dependencies(planner ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) target_link_libraries(planner ${PROJECT_NAME} ${catkin_LIBRARIES} diff --git a/map_server/CMakeLists.txt b/map_server/CMakeLists.txt index 63990538b5..6846f2a833 100644 --- a/map_server/CMakeLists.txt +++ b/map_server/CMakeLists.txt @@ -41,6 +41,7 @@ include_directories( ) add_library(map_server_image_loader src/image_loader.cpp) +add_dependencies(map_server_image_loader ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) target_link_libraries(map_server_image_loader ${catkin_LIBRARIES} ${SDL_LIBRARY} @@ -48,6 +49,7 @@ target_link_libraries(map_server_image_loader ) add_executable(map_server src/main.cpp) +add_dependencies(map_server ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) target_link_libraries(map_server map_server_image_loader ${YAMLCPP_LIBRARIES} @@ -55,6 +57,7 @@ target_link_libraries(map_server ) add_executable(map_server-map_saver src/map_saver.cpp) +add_dependencies(map_server-map_saver ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) set_target_properties(map_server-map_saver PROPERTIES OUTPUT_NAME map_saver) target_link_libraries(map_server-map_saver ${catkin_LIBRARIES} @@ -81,14 +84,14 @@ if(CATKIN_ENABLE_TESTING) ) add_executable(rtest test/rtest.cpp test/test_constants.cpp) + add_dependencies(rtest ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) target_link_libraries( rtest gtest ${catkin_LIBRARIES} ) - add_dependencies(rtest nav_msgs_generate_messages_cpp) # This has to be done after we've already built targets, or catkin variables get borked - find_package(rostest) + find_package(rostest REQUIRED) add_rostest(test/rtest.xml) endif() diff --git a/map_server/package.xml b/map_server/package.xml index fd18459689..ec6d4662e6 100644 --- a/map_server/package.xml +++ b/map_server/package.xml @@ -17,7 +17,6 @@ nav_msgs roscpp - rostest sdl sdl-image tf @@ -25,11 +24,12 @@ nav_msgs roscpp - rostest sdl sdl-image tf yaml-cpp rospy + rostest + rosunit diff --git a/move_base/CMakeLists.txt b/move_base/CMakeLists.txt index 6e27a7ffea..f4e272ef2c 100644 --- a/move_base/CMakeLists.txt +++ b/move_base/CMakeLists.txt @@ -3,14 +3,22 @@ project(move_base) find_package(catkin REQUIRED COMPONENTS - cmake_modules - roscpp - pluginlib actionlib + base_local_planner + clear_costmap_recovery + cmake_modules + costmap_2d dynamic_reconfigure + geometry_msgs message_generation move_base_msgs nav_core + nav_msgs + navfn + pluginlib + roscpp + rospy + rotate_recovery std_srvs tf ) @@ -24,8 +32,11 @@ generate_dynamic_reconfigure_options( catkin_package( CATKIN_DEPENDS - roscpp dynamic_reconfigure + geometry_msgs + move_base_msgs + nav_msgs + roscpp ) include_directories( @@ -42,12 +53,12 @@ target_link_libraries(move_base ${Boost_LIBRARIES} ${catkin_LIBRARIES} ) -add_dependencies(move_base move_base_gencfg) -add_dependencies(move_base geometry_msgs_generate_messages_cpp) +add_dependencies(move_base ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) add_executable(move_base_node src/move_base_node.cpp ) +add_dependencies(move_base_node ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) target_link_libraries(move_base_node move_base) set_target_properties(move_base_node PROPERTIES OUTPUT_NAME move_base) diff --git a/move_base/package.xml b/move_base/package.xml index d491fc85c6..a9bcab16a0 100644 --- a/move_base/package.xml +++ b/move_base/package.xml @@ -27,10 +27,8 @@ pluginlib roscpp rospy - std_msgs std_srvs tf - visualization_msgs base_local_planner @@ -42,8 +40,6 @@ navfn rotate_recovery - - actionlib costmap_2d dynamic_reconfigure @@ -55,9 +51,7 @@ pluginlib roscpp rospy - std_msgs std_srvs tf - visualization_msgs diff --git a/move_slow_and_clear/CMakeLists.txt b/move_slow_and_clear/CMakeLists.txt index bb95698277..2611c49d01 100644 --- a/move_slow_and_clear/CMakeLists.txt +++ b/move_slow_and_clear/CMakeLists.txt @@ -4,12 +4,11 @@ project(move_slow_and_clear) find_package(catkin REQUIRED COMPONENTS cmake_modules - roscpp - nav_core costmap_2d - actionlib_msgs - std_msgs + geometry_msgs + nav_core pluginlib + roscpp ) @@ -29,13 +28,14 @@ catkin_package( INCLUDE_DIRS include LIBRARIES move_slow_and_clear CATKIN_DEPENDS - roscpp - pluginlib + geometry_msgs nav_core + pluginlib + roscpp ) add_library(${PROJECT_NAME} src/move_slow_and_clear.cpp) -add_dependencies(${PROJECT_NAME} geometry_msgs_generate_messages_cpp) +add_dependencies(${PROJECT_NAME} ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) target_link_libraries(${PROJECT_NAME} ${Boost_LIBRARIES} ${catkin_LIBRARIES} diff --git a/navfn/CMakeLists.txt b/navfn/CMakeLists.txt index 5823fd4c40..717112605b 100644 --- a/navfn/CMakeLists.txt +++ b/navfn/CMakeLists.txt @@ -6,11 +6,13 @@ find_package(catkin REQUIRED cmake_modules costmap_2d geometry_msgs + message_generation nav_core nav_msgs pcl_conversions pcl_ros pluginlib + rosconsole roscpp tf visualization_msgs @@ -38,9 +40,7 @@ add_service_files( generate_messages( DEPENDENCIES - std_msgs geometry_msgs - nav_msgs ) catkin_package( @@ -49,9 +49,13 @@ catkin_package( LIBRARIES navfn CATKIN_DEPENDS + geometry_msgs + message_runtime nav_core - roscpp + nav_msgs pluginlib + roscpp + visualization_msgs ) add_library (navfn src/navfn.cpp src/navfn_ros.cpp) diff --git a/navfn/package.xml b/navfn/package.xml index cabd36f040..1e0f687d2c 100644 --- a/navfn/package.xml +++ b/navfn/package.xml @@ -49,6 +49,8 @@ tf visualization_msgs + rosunit + diff --git a/robot_pose_ekf/CMakeLists.txt b/robot_pose_ekf/CMakeLists.txt index 66ed38f6bb..a2d8529bb6 100644 --- a/robot_pose_ekf/CMakeLists.txt +++ b/robot_pose_ekf/CMakeLists.txt @@ -35,7 +35,12 @@ generate_messages( catkin_package( CATKIN_DEPENDS + geometry_msgs + message_runtime + nav_msgs roscpp + sensor_msgs + std_msgs ) include_directories( @@ -53,7 +58,7 @@ target_link_libraries(robot_pose_ekf ${Boost_LIBRARIES} ${BFL_LIBRARIES} ) -add_dependencies(robot_pose_ekf robot_pose_ekf_generate_messages_cpp) +add_dependencies(robot_pose_ekf ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) install( TARGETS @@ -89,6 +94,7 @@ target_link_libraries(test_robot_pose_ekf ${BFL_LIBRARIES} gtest ) +add_dependencies(test_robot_pose_ekf ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) catkin_download_test_data( download_data_zero_covariance.bag @@ -103,9 +109,10 @@ target_link_libraries(test_robot_pose_ekf_zero_covariance ${BFL_LIBRARIES} gtest ) +add_dependencies(test_robot_pose_ekf_zero_covariance ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) # This has to be done after we've already built targets, or catkin variables get borked -find_package(rostest) +find_package(rostest REQUIRED) add_rostest(${CMAKE_CURRENT_SOURCE_DIR}/test/test_robot_pose_ekf.launch) add_rostest(${CMAKE_CURRENT_SOURCE_DIR}/test/test_robot_pose_ekf_zero_covariance.launch) diff --git a/robot_pose_ekf/package.xml b/robot_pose_ekf/package.xml index 6d77800b2d..41644bcb3b 100644 --- a/robot_pose_ekf/package.xml +++ b/robot_pose_ekf/package.xml @@ -15,8 +15,8 @@ catkin + message_generation roscpp - rostest bfl std_msgs geometry_msgs @@ -24,8 +24,8 @@ nav_msgs tf + message_runtime roscpp - rostest bfl std_msgs geometry_msgs @@ -34,4 +34,5 @@ tf rosbag + rostest diff --git a/rotate_recovery/CMakeLists.txt b/rotate_recovery/CMakeLists.txt index 6ada8a7f8c..3cc6610a4f 100644 --- a/rotate_recovery/CMakeLists.txt +++ b/rotate_recovery/CMakeLists.txt @@ -29,6 +29,7 @@ catkin_package( ) add_library(rotate_recovery src/rotate_recovery.cpp) +add_dependencies(rotate_recovery ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) target_link_libraries(rotate_recovery ${catkin_LIBRARIES}) install(TARGETS rotate_recovery @@ -36,6 +37,11 @@ install(TARGETS rotate_recovery LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} ) +install(DIRECTORY include/${PROJECT_NAME}/ + DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} + FILES_MATCHING PATTERN "*.h" +) + install(FILES rotate_plugin.xml DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} ) diff --git a/voxel_grid/CMakeLists.txt b/voxel_grid/CMakeLists.txt index fa149d36c2..d65925a58f 100644 --- a/voxel_grid/CMakeLists.txt +++ b/voxel_grid/CMakeLists.txt @@ -18,6 +18,7 @@ catkin_package( include_directories(include ${catkin_INCLUDE_DIRS}) add_library(voxel_grid src/voxel_grid.cpp) +add_dependencies(voxel_grid ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}) target_link_libraries(voxel_grid ${catkin_LIBRARIES}) install(TARGETS voxel_grid diff --git a/voxel_grid/package.xml b/voxel_grid/package.xml index 422a5009ac..8b75236273 100644 --- a/voxel_grid/package.xml +++ b/voxel_grid/package.xml @@ -18,4 +18,6 @@ roscpp roscpp + + rosunit