Cleanup cmakelists and build with release and debug symbols by default

bit-bots · Jan 6, 2025 · 43327ab · 43327ab
1 parent 926c663
commit 43327ab
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 34 deletions.
diff --git a/bitbots_misc/bitbots_basler_camera/package.xml b/bitbots_misc/bitbots_basler_camera/package.xml
@@ -12,6 +12,7 @@
 
   <author email="info@bit-bots.de">Hamburg Bit-Bots</author>
 
+  <depend>backward_ros</depend>
   <depend>bitbots_docs</depend>
   <depend>camera_info_manager</depend>
   <depend>cv_bridge</depend>

diff --git 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
@@ -9,17 +9,17 @@
     <maintainer email="info@bit-bots.de">Hamburg Bit-Bots</maintainer>
 
     <license>MIT</license>
-    
+
     <author email="florian.vahl@uni-hamburg.de">Florian Vahl</author>
 
     <buildtool_depend>ament_cmake</buildtool_depend>
 
+    <depend>backward_ros</depend>
     <depend>bitbots_docs</depend>
+    <depend>rot_conv</depend>
     <depend>std_msgs</depend>
-    <depend>tf2</depend>
     <depend>tf2_ros</depend>
-    <depend>rot_conv</depend>
-    <depend>backward_ros</depend>
+    <depend>tf2</depend>
 
     <export>
         <bitbots_documentation>

diff --git 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
@@ -11,11 +11,12 @@
     <maintainer email="info@bit-bots.de">Hamburg Bit-Bots</maintainer>
 
     <license>MIT</license>
-    
+
     <author email="info@bit-bots.de">Hamburg Bit-Bots</author>
 
     <buildtool_depend>ament_cmake</buildtool_depend>
 
+    <depend>backward_ros</depend>
     <depend>bitbots_docs</depend>
     <depend>python3-yaml</depend>
     <depend>python3-transforms3d</depend>

diff --git 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
@@ -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
@@ -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
@@ -10,16 +10,16 @@
   <license>MIT</license>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
-  <depend>bitbots_docs</depend>
-  <depend>bio_ik</depend>
+  <depend>backward_ros</depend>
   <depend>bio_ik_msgs</depend>
+  <depend>bio_ik</depend>
+  <depend>bitbots_docs</depend>
   <depend>moveit_core</depend>
-  <depend>moveit_ros_planning</depend>
   <depend>moveit_ros_planning_interface</depend>
+  <depend>moveit_ros_planning</depend>
   <depend>pybind11_vendor</depend>
   <depend>ros2_python_extension</depend>
   <export>
-
-  <build_type>ament_cmake</build_type>
+    <build_type>ament_cmake</build_type>
   </export>
 </package>
diff --git 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
@@ -16,15 +16,16 @@
 
 
   <buildtool_depend>ament_cmake</buildtool_depend>
-  <depend>std_msgs</depend>
-  <depend>geometry_msgs</depend>
+  <depend>backward_ros</depend>
   <depend>bitbots_docs</depend>
-  <depend>rclcpp</depend>
-  <depend>tf2_geometry_msgs</depend>
+  <depend>eigen</depend>
+  <depend>geometry_msgs</depend>
   <depend>moveit_core</depend>
   <depend>moveit_ros_planning</depend>
-  <depend>eigen</depend>
   <depend>python3-matplotlib</depend>
+  <depend>rclcpp</depend>
+  <depend>std_msgs</depend>
+  <depend>tf2_geometry_msgs</depend>
 
   <export>
     <bitbots_documentation>

diff --git 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
@@ -14,6 +14,7 @@
   <author email="jasper@bit-bots.de">Jasper Güldenstein</author>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
+  <depend>backward_ros</depend>
   <depend>biped_interfaces</depend>
   <depend>bitbots_docs</depend>
   <depend>bitbots_utils</depend>