diff --git a/base_local_planner/CMakeLists.txt b/base_local_planner/CMakeLists.txt index 1bae6a4b2c..2444ae150f 100644 --- a/base_local_planner/CMakeLists.txt +++ b/base_local_planner/CMakeLists.txt @@ -21,15 +21,16 @@ find_package(Boost REQUIRED thread ) -find_package(Eigen REQUIRED) +find_package(Eigen3 REQUIRED) find_package(PCL REQUIRED) +remove_definitions(-DDISABLE_LIBUSB-1.0) include_directories( include ${catkin_INCLUDE_DIRS} - ${EIGEN_INCLUDE_DIRS} + ${EIGEN3_INCLUDE_DIRS} ${PCL_INCLUDE_DIRS} ) -add_definitions(${EIGEN_DEFINITIONS}) +add_definitions(${EIGEN3_DEFINITIONS}) catkin_python_setup() @@ -92,8 +93,8 @@ add_library(base_local_planner src/trajectory.cpp src/voxel_grid_model.cpp) add_dependencies(base_local_planner base_local_planner_gencfg) -add_dependencies(base_local_planner base_local_planner_gencpp) -add_dependencies(base_local_planner nav_msgs_gencpp) +add_dependencies(base_local_planner base_local_planner_generate_messages_cpp) +add_dependencies(base_local_planner nav_msgs_generate_messages_cpp) target_link_libraries(base_local_planner ${catkin_LIBRARIES} ${PCL_LIBRARIES} @@ -104,7 +105,7 @@ 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_gencpp) +add_dependencies(trajectory_planner_ros nav_msgs_generate_messages_cpp) target_link_libraries(trajectory_planner_ros base_local_planner) diff --git a/carrot_planner/CMakeLists.txt b/carrot_planner/CMakeLists.txt index c3fecd3256..c06cc9fbf2 100644 --- a/carrot_planner/CMakeLists.txt +++ b/carrot_planner/CMakeLists.txt @@ -15,7 +15,7 @@ include_directories( include ${catkin_INCLUDE_DIRS} ) -add_definitions(${EIGEN_DEFINITIONS}) +add_definitions(${EIGEN3_DEFINITIONS}) catkin_package( INCLUDE_DIRS include diff --git a/clear_costmap_recovery/CMakeLists.txt b/clear_costmap_recovery/CMakeLists.txt index f07b1bb399..2486f880b3 100644 --- a/clear_costmap_recovery/CMakeLists.txt +++ b/clear_costmap_recovery/CMakeLists.txt @@ -11,15 +11,16 @@ find_package(catkin REQUIRED tf ) -find_package(Eigen REQUIRED) +find_package(Eigen3 REQUIRED) find_package(PCL REQUIRED) +remove_definitions(-DDISABLE_LIBUSB-1.0) include_directories( include ${catkin_INCLUDE_DIRS} - ${EIGEN_INCLUDE_DIRS} + ${EIGEN3_INCLUDE_DIRS} ${PCL_INCLUDE_DIRS} ) -add_definitions(${EIGEN_DEFINITIONS}) +add_definitions(${EIGEN3_DEFINITIONS}) catkin_package( INCLUDE_DIRS include @@ -49,7 +50,6 @@ if(CATKIN_ENABLE_TESTING) # Create targets for test executables add_rostest_gtest(clear_tester test/clear_tests.launch test/clear_tester.cpp) - add_dependencies(tests clear_tester ${catkin_LIBRARIES}) target_link_libraries(clear_tester clear_costmap_recovery ${GTEST_LIBRARIES}) endif() diff --git a/costmap_2d/CMakeLists.txt b/costmap_2d/CMakeLists.txt index 29855d8f19..b39afe644d 100644 --- a/costmap_2d/CMakeLists.txt +++ b/costmap_2d/CMakeLists.txt @@ -18,21 +18,23 @@ find_package(catkin REQUIRED sensor_msgs std_msgs tf + visualization_msgs voxel_grid ) find_package(PCL REQUIRED) -find_package(Eigen REQUIRED) +remove_definitions(-DDISABLE_LIBUSB-1.0) +find_package(Eigen3 REQUIRED) find_package(Boost REQUIRED COMPONENTS system thread) include_directories( include ${catkin_INCLUDE_DIRS} - ${EIGEN_INCLUDE_DIRS} + ${EIGEN3_INCLUDE_DIRS} ${PCL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) -add_definitions(${EIGEN_DEFINITIONS}) +add_definitions(${EIGEN3_DEFINITIONS}) # messages add_message_files( @@ -60,7 +62,7 @@ generate_dynamic_reconfigure_options( catkin_package( INCLUDE_DIRS include - ${EIGEN_INCLUDE_DIRS} + ${EIGEN3_INCLUDE_DIRS} ${PCL_INCLUDE_DIRS} LIBRARIES costmap_2d layers CATKIN_DEPENDS @@ -80,7 +82,7 @@ catkin_package( voxel_grid DEPENDS PCL - Eigen + EIGEN3 Boost ) diff --git a/dwa_local_planner/CMakeLists.txt b/dwa_local_planner/CMakeLists.txt index 6e9a11a7a8..99c41592d5 100644 --- a/dwa_local_planner/CMakeLists.txt +++ b/dwa_local_planner/CMakeLists.txt @@ -15,15 +15,16 @@ find_package(catkin REQUIRED tf ) -find_package(Eigen REQUIRED) +find_package(Eigen3 REQUIRED) find_package(PCL REQUIRED) +remove_definitions(-DDISABLE_LIBUSB-1.0) include_directories( include ${catkin_INCLUDE_DIRS} - ${EIGEN_INCLUDE_DIRS} + ${EIGEN3_INCLUDE_DIRS} ${PCL_INCLUDE_DIRS} ) -add_definitions(${EIGEN_DEFINITIONS}) +add_definitions(${EIGEN3_DEFINITIONS}) link_directories(${catkin_LIBRARY_DIRS}) @@ -44,7 +45,7 @@ catkin_package( add_library(dwa_local_planner src/dwa_planner.cpp src/dwa_planner_ros.cpp) target_link_libraries(dwa_local_planner ${catkin_LIBRARIES}) add_dependencies(dwa_local_planner dwa_local_planner_gencfg) -add_dependencies(dwa_local_planner nav_msgs_gencpp) +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 acd0f5c38a..12d2b7a226 100644 --- a/fake_localization/CMakeLists.txt +++ b/fake_localization/CMakeLists.txt @@ -29,8 +29,8 @@ target_link_libraries(fake_localization ${Boost_LIBRARIES} ) -add_dependencies(fake_localization nav_msgs_gencpp) -add_dependencies(fake_localization geometry_msgs_gencpp) +add_dependencies(fake_localization nav_msgs_generate_messages_cpp) +add_dependencies(fake_localization geometry_msgs_generate_messages_cpp) install( PROGRAMS diff --git a/map_server/CMakeLists.txt b/map_server/CMakeLists.txt index b36ef7582a..be26687bd9 100644 --- a/map_server/CMakeLists.txt +++ b/map_server/CMakeLists.txt @@ -65,7 +65,7 @@ if(CATKIN_ENABLE_TESTING) gtest ${catkin_LIBRARIES} ) - add_dependencies(rtest nav_msgs_gencpp) + 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) diff --git a/move_base/CMakeLists.txt b/move_base/CMakeLists.txt index 6e0ec18a8f..6fbb701f78 100644 --- a/move_base/CMakeLists.txt +++ b/move_base/CMakeLists.txt @@ -13,8 +13,8 @@ find_package(catkin REQUIRED nav_core tf ) -find_package(Eigen REQUIRED) -add_definitions(${EIGEN_DEFINITIONS}) +find_package(Eigen3 REQUIRED) +add_definitions(${EIGEN3_DEFINITIONS}) # dynamic reconfigure generate_dynamic_reconfigure_options( @@ -30,7 +30,7 @@ catkin_package( include_directories( include ${catkin_INCLUDE_DIRS} - ${EIGEN_INCLUDE_DIRS} + ${EIGEN3_INCLUDE_DIRS} ) # move_base @@ -42,7 +42,7 @@ target_link_libraries(move_base ${catkin_LIBRARIES} ) add_dependencies(move_base move_base_gencfg) -add_dependencies(move_base geometry_msgs_gencpp) +add_dependencies(move_base geometry_msgs_generate_messages_cpp) add_executable(move_base_node src/move_base_node.cpp diff --git a/move_slow_and_clear/CMakeLists.txt b/move_slow_and_clear/CMakeLists.txt index 078052d062..09ea8b6232 100644 --- a/move_slow_and_clear/CMakeLists.txt +++ b/move_slow_and_clear/CMakeLists.txt @@ -13,17 +13,18 @@ find_package(catkin REQUIRED ) -find_package(Eigen REQUIRED) +find_package(Eigen3 REQUIRED) find_package(PCL REQUIRED) +remove_definitions(-DDISABLE_LIBUSB-1.0) find_package(Boost REQUIRED COMPONENTS thread) include_directories( include ${catkin_INCLUDE_DIRS} SYSTEM - ${EIGEN_INCLUDE_DIRS} + ${EIGEN3_INCLUDE_DIRS} ${PCL_INCLUDE_DIRS} ) -add_definitions(${EIGEN_DEFINITIONS}) +add_definitions(${EIGEN3_DEFINITIONS}) catkin_package( INCLUDE_DIRS include @@ -35,7 +36,7 @@ catkin_package( ) add_library(${PROJECT_NAME} src/move_slow_and_clear.cpp) -add_dependencies(${PROJECT_NAME} geometry_msgs_gencpp) +add_dependencies(${PROJECT_NAME} geometry_msgs_generate_messages_cpp) target_link_libraries(${PROJECT_NAME} ${Boost_LIBRARIES} ${catkin_LIBRARIES} diff --git a/navfn/CMakeLists.txt b/navfn/CMakeLists.txt index ad01c3a487..ed48e27fd6 100644 --- a/navfn/CMakeLists.txt +++ b/navfn/CMakeLists.txt @@ -16,16 +16,17 @@ find_package(catkin REQUIRED visualization_msgs ) -find_package(Eigen REQUIRED) +find_package(Eigen3 REQUIRED) find_package(PCL REQUIRED) +remove_definitions(-DDISABLE_LIBUSB-1.0) include_directories( include ${catkin_INCLUDE_DIRS} SYSTEM - ${EIGEN_INCLUDE_DIRS} + ${EIGEN3_INCLUDE_DIRS} ${PCL_INCLUDE_DIRS} ) -add_definitions(${EIGEN_DEFINITIONS}) +add_definitions(${EIGEN3_DEFINITIONS}) # services diff --git a/robot_pose_ekf/CMakeLists.txt b/robot_pose_ekf/CMakeLists.txt index 1e4140ad8f..66ed38f6bb 100644 --- a/robot_pose_ekf/CMakeLists.txt +++ b/robot_pose_ekf/CMakeLists.txt @@ -53,7 +53,7 @@ target_link_libraries(robot_pose_ekf ${Boost_LIBRARIES} ${BFL_LIBRARIES} ) -add_dependencies(robot_pose_ekf robot_pose_ekf_gencpp) +add_dependencies(robot_pose_ekf robot_pose_ekf_generate_messages_cpp) install( TARGETS diff --git a/rotate_recovery/CMakeLists.txt b/rotate_recovery/CMakeLists.txt index 0755157071..6ada8a7f8c 100644 --- a/rotate_recovery/CMakeLists.txt +++ b/rotate_recovery/CMakeLists.txt @@ -12,13 +12,13 @@ find_package(catkin REQUIRED base_local_planner ) -find_package(Eigen REQUIRED) +find_package(Eigen3 REQUIRED) include_directories( include ${catkin_INCLUDE_DIRS} - ${EIGEN_INCLUDE_DIRS} + ${EIGEN3_INCLUDE_DIRS} ) -add_definitions(${EIGEN_DEFINITIONS}) +add_definitions(${EIGEN3_DEFINITIONS}) catkin_package( INCLUDE_DIRS include