From 43327ab5bdaea940aead2d9a8a9880aa28c09612 Mon Sep 17 00:00:00 2001 From: Florian Vahl Date: Mon, 6 Jan 2025 19:39:17 +0100 Subject: [PATCH] Cleanup cmakelists and build with release and debug symbols by default --- bitbots_misc/bitbots_basler_camera/package.xml | 1 + .../bitbots_extrinsic_calibration/CMakeLists.txt | 12 ++++++------ .../bitbots_extrinsic_calibration/package.xml | 8 ++++---- bitbots_misc/bitbots_utils/CMakeLists.txt | 3 ++- bitbots_misc/bitbots_utils/package.xml | 3 ++- bitbots_motion/bitbots_dynamic_kick/CMakeLists.txt | 4 ++-- bitbots_motion/bitbots_head_mover/CMakeLists.txt | 2 -- .../bitbots_moveit_bindings/CMakeLists.txt | 8 ++++---- bitbots_motion/bitbots_moveit_bindings/package.xml | 10 +++++----- bitbots_motion/bitbots_splines/CMakeLists.txt | 10 ++++++---- bitbots_motion/bitbots_splines/package.xml | 11 ++++++----- bitbots_navigation/bitbots_odometry/CMakeLists.txt | 3 +++ bitbots_navigation/bitbots_odometry/package.xml | 1 + 13 files changed, 42 insertions(+), 34 deletions(-) diff --git a/bitbots_misc/bitbots_basler_camera/package.xml b/bitbots_misc/bitbots_basler_camera/package.xml index 1d7cc8afd..0dd36aaf0 100644 --- a/bitbots_misc/bitbots_basler_camera/package.xml +++ b/bitbots_misc/bitbots_basler_camera/package.xml @@ -12,6 +12,7 @@ Hamburg Bit-Bots + backward_ros bitbots_docs camera_info_manager cv_bridge diff --git a/bitbots_misc/bitbots_extrinsic_calibration/CMakeLists.txt b/bitbots_misc/bitbots_extrinsic_calibration/CMakeLists.txt index 9f301a56a..f7c77480f 100644 --- a/bitbots_misc/bitbots_extrinsic_calibration/CMakeLists.txt +++ b/bitbots_misc/bitbots_extrinsic_calibration/CMakeLists.txt @@ -11,16 +11,16 @@ if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE RelWithDebug) endif() +find_package(ament_cmake REQUIRED) +find_package(backward_ros REQUIRED) +find_package(bitbots_docs REQUIRED) find_package(geometry_msgs REQUIRED) find_package(rclcpp REQUIRED) -find_package(ament_cmake REQUIRED) -find_package(tf2_ros REQUIRED) +find_package(rot_conv REQUIRED) find_package(std_msgs REQUIRED) -find_package(tf2_geometry_msgs REQUIRED) -find_package(bitbots_docs REQUIRED) find_package(tf2 REQUIRED) -find_package(rot_conv REQUIRED) -find_package(backward_ros REQUIRED) +find_package(tf2_geometry_msgs REQUIRED) +find_package(tf2_ros REQUIRED) add_compile_options(-Wall -Werror -Wno-unused) diff --git a/bitbots_misc/bitbots_extrinsic_calibration/package.xml b/bitbots_misc/bitbots_extrinsic_calibration/package.xml index 1a8ec771e..07c816826 100644 --- a/bitbots_misc/bitbots_extrinsic_calibration/package.xml +++ b/bitbots_misc/bitbots_extrinsic_calibration/package.xml @@ -9,17 +9,17 @@ Hamburg Bit-Bots MIT - + Florian Vahl ament_cmake + backward_ros bitbots_docs + rot_conv std_msgs - tf2 tf2_ros - rot_conv - backward_ros + tf2 diff --git a/bitbots_misc/bitbots_utils/CMakeLists.txt b/bitbots_misc/bitbots_utils/CMakeLists.txt index 76896dcb6..1951ecba9 100644 --- a/bitbots_misc/bitbots_utils/CMakeLists.txt +++ b/bitbots_misc/bitbots_utils/CMakeLists.txt @@ -12,6 +12,7 @@ if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) endif() find_package(bitbots_docs REQUIRED) +find_package(backward_ros REQUIRED) find_package(ament_cmake REQUIRED) find_package(ament_cmake_python REQUIRED) find_package(rclcpp REQUIRED) @@ -31,7 +32,7 @@ add_compile_options(-Wall -Werror -Wno-unused -pedantic -Wextra -fPIC) add_library(${PROJECT_NAME} src/utils.cpp) # Add dependencies to cpp library -ament_target_dependencies(${PROJECT_NAME} rclcpp tf2_ros) +ament_target_dependencies(${PROJECT_NAME} rclcpp tf2_ros backward_ros) ament_export_dependencies(rclcpp) ament_export_include_directories(${INCLUDE_DIRS}) diff --git a/bitbots_misc/bitbots_utils/package.xml b/bitbots_misc/bitbots_utils/package.xml index d2eb7babf..066879d4c 100644 --- a/bitbots_misc/bitbots_utils/package.xml +++ b/bitbots_misc/bitbots_utils/package.xml @@ -11,11 +11,12 @@ Hamburg Bit-Bots MIT - + Hamburg Bit-Bots ament_cmake + backward_ros bitbots_docs python3-yaml python3-transforms3d diff --git a/bitbots_motion/bitbots_dynamic_kick/CMakeLists.txt b/bitbots_motion/bitbots_dynamic_kick/CMakeLists.txt index 0de3e0678..e9ca70b50 100644 --- a/bitbots_motion/bitbots_dynamic_kick/CMakeLists.txt +++ b/bitbots_motion/bitbots_dynamic_kick/CMakeLists.txt @@ -12,8 +12,9 @@ if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) endif() find_package(ament_cmake REQUIRED) -find_package(bitbots_docs REQUIRED) +find_package(backward_ros REQUIRED) find_package(biped_interfaces REQUIRED) +find_package(bitbots_docs REQUIRED) find_package(bitbots_msgs REQUIRED) find_package(bitbots_splines REQUIRED) find_package(control_msgs REQUIRED) @@ -30,7 +31,6 @@ find_package(tf2 REQUIRED) find_package(tf2_eigen REQUIRED) find_package(tf2_geometry_msgs REQUIRED) find_package(tf2_ros REQUIRED) -find_package(backward_ros REQUIRED) find_package(PythonLibs COMPONENTS Interpreter Development) diff --git a/bitbots_motion/bitbots_head_mover/CMakeLists.txt b/bitbots_motion/bitbots_head_mover/CMakeLists.txt index e1e7ebd86..a2dbed10a 100644 --- a/bitbots_motion/bitbots_head_mover/CMakeLists.txt +++ b/bitbots_motion/bitbots_head_mover/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 3.8) project(bitbots_head_mover) - # Build with release optimizations and debug symbols by default if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE RelWithDebug) @@ -18,7 +17,6 @@ find_package(bio_ik REQUIRED) find_package(bio_ik_msgs REQUIRED) find_package(bitbots_msgs REQUIRED) find_package(generate_parameter_library REQUIRED) -find_package(bitbots_msgs REQUIRED) find_package(moveit_core REQUIRED) find_package(moveit_msgs REQUIRED) find_package(moveit_ros_planning REQUIRED) diff --git a/bitbots_motion/bitbots_moveit_bindings/CMakeLists.txt b/bitbots_motion/bitbots_moveit_bindings/CMakeLists.txt index 91cf9114b..4d90c35e7 100644 --- a/bitbots_motion/bitbots_moveit_bindings/CMakeLists.txt +++ b/bitbots_motion/bitbots_moveit_bindings/CMakeLists.txt @@ -13,22 +13,22 @@ endif() set(PYBIND11_PYTHON_VERSION 3) set(PYBIND11_FINDPYTHON ON) -find_package(bitbots_docs REQUIRED) find_package(ament_cmake REQUIRED) find_package(backward_ros REQUIRED) find_package(bio_ik REQUIRED) find_package(bio_ik_msgs REQUIRED) +find_package(bitbots_docs REQUIRED) find_package(moveit_core REQUIRED) find_package(moveit_msgs REQUIRED) -find_package(moveit_ros_planning_interface REQUIRED) find_package(moveit_ros_planning REQUIRED) +find_package(moveit_ros_planning_interface REQUIRED) find_package(pybind11 REQUIRED) find_package(Python3 REQUIRED COMPONENTS Interpreter Development) +find_package(rclcpp REQUIRED) find_package(ros2_python_extension) find_package(tf2 REQUIRED) -find_package(tf2_ros REQUIRED) find_package(tf2_kdl REQUIRED) -find_package(rclcpp REQUIRED) +find_package(tf2_ros REQUIRED) add_compile_options(-Wall -Wno-unused) diff --git a/bitbots_motion/bitbots_moveit_bindings/package.xml b/bitbots_motion/bitbots_moveit_bindings/package.xml index 3b7312d36..0353a9065 100644 --- a/bitbots_motion/bitbots_moveit_bindings/package.xml +++ b/bitbots_motion/bitbots_moveit_bindings/package.xml @@ -10,16 +10,16 @@ MIT ament_cmake - bitbots_docs - bio_ik + backward_ros bio_ik_msgs + bio_ik + bitbots_docs moveit_core - moveit_ros_planning moveit_ros_planning_interface + moveit_ros_planning pybind11_vendor ros2_python_extension - - ament_cmake + ament_cmake diff --git a/bitbots_motion/bitbots_splines/CMakeLists.txt b/bitbots_motion/bitbots_splines/CMakeLists.txt index 62ffa92e8..ae1098145 100644 --- a/bitbots_motion/bitbots_splines/CMakeLists.txt +++ b/bitbots_motion/bitbots_splines/CMakeLists.txt @@ -12,15 +12,16 @@ if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) endif() find_package(ament_cmake REQUIRED) +find_package(backward_ros REQUIRED) find_package(bitbots_docs REQUIRED) -find_package(rclcpp REQUIRED) -find_package(std_msgs REQUIRED) +find_package(Eigen3 REQUIRED) find_package(geometry_msgs REQUIRED) -find_package(tf2_geometry_msgs REQUIRED) find_package(moveit_core REQUIRED) find_package(moveit_ros_planning REQUIRED) -find_package(Eigen3 REQUIRED) find_package(PkgConfig REQUIRED) +find_package(rclcpp REQUIRED) +find_package(std_msgs REQUIRED) +find_package(tf2_geometry_msgs REQUIRED) set(INCLUDE_DIRS include) include_directories(${INCLUDE_DIRS}) @@ -43,6 +44,7 @@ add_library(${PROJECT_NAME} SHARED ${SOURCES}) ament_target_dependencies( ${PROJECT_NAME} ament_cmake + backward_ros bitbots_docs rclcpp std_msgs diff --git a/bitbots_motion/bitbots_splines/package.xml b/bitbots_motion/bitbots_splines/package.xml index d73d3a817..3d0966b98 100644 --- a/bitbots_motion/bitbots_splines/package.xml +++ b/bitbots_motion/bitbots_splines/package.xml @@ -16,15 +16,16 @@ ament_cmake - std_msgs - geometry_msgs + backward_ros bitbots_docs - rclcpp - tf2_geometry_msgs + eigen + geometry_msgs moveit_core moveit_ros_planning - eigen python3-matplotlib + rclcpp + std_msgs + tf2_geometry_msgs diff --git a/bitbots_navigation/bitbots_odometry/CMakeLists.txt b/bitbots_navigation/bitbots_odometry/CMakeLists.txt index aad1b1d15..90e8feefe 100644 --- a/bitbots_navigation/bitbots_odometry/CMakeLists.txt +++ b/bitbots_navigation/bitbots_odometry/CMakeLists.txt @@ -12,6 +12,7 @@ if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) endif() find_package(ament_cmake REQUIRED) +find_package(backward_ros REQUIRED) find_package(biped_interfaces REQUIRED) find_package(bitbots_docs REQUIRED) find_package(bitbots_utils REQUIRED) @@ -44,6 +45,7 @@ target_link_libraries(motion_odometry rclcpp::rclcpp odometry_parameters) ament_target_dependencies( motion_odometry ament_cmake + backward_ros biped_interfaces bitbots_docs bitbots_utils @@ -62,6 +64,7 @@ ament_target_dependencies( ament_target_dependencies( odometry_fuser ament_cmake + backward_ros biped_interfaces bitbots_docs bitbots_utils diff --git a/bitbots_navigation/bitbots_odometry/package.xml b/bitbots_navigation/bitbots_odometry/package.xml index c3db876be..ea39d7b19 100644 --- a/bitbots_navigation/bitbots_odometry/package.xml +++ b/bitbots_navigation/bitbots_odometry/package.xml @@ -14,6 +14,7 @@ Jasper Güldenstein ament_cmake + backward_ros biped_interfaces bitbots_docs bitbots_utils