Skip to content

Commit 926c663

Browse files
FlovaFlova
committed
Build with release and refactor some CMakeLists.txt files
1 parent f2a9b9d commit 926c663

File tree

29 files changed

+296
-608
lines changed

29 files changed

+296
-608
lines changed

Diff for: ‎bitbots_behavior/bitbots_blackboard/CMakeLists.txt

+2-71
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,12 @@
11
cmake_minimum_required(VERSION 3.5)
22
project(bitbots_blackboard)
33

4-
# Add support for C++17
5-
if(NOT CMAKE_CXX_STANDARD)
6-
set(CMAKE_CXX_STANDARD 17)
7-
endif()
8-
9-
find_package(bio_ik_msgs REQUIRED)
10-
find_package(ament_cmake REQUIRED)
11-
find_package(sensor_msgs REQUIRED)
12-
find_package(rclpy REQUIRED)
13-
find_package(tf2 REQUIRED)
14-
find_package(bitbots_msgs REQUIRED)
15-
find_package(std_msgs REQUIRED)
16-
find_package(tf2_geometry_msgs REQUIRED)
17-
find_package(std_srvs REQUIRED)
18-
find_package(geometry_msgs REQUIRED)
194
find_package(bitbots_docs REQUIRED)
5+
find_package(ament_cmake REQUIRED)
6+
find_package(ament_cmake_python REQUIRED)
207

21-
set(INCLUDE_DIRS
22-
${bio_ik_msgs_INCLUDE_DIRS}
23-
${ament_cmake_INCLUDE_DIRS}
24-
${sensor_msgs_INCLUDE_DIRS}
25-
${rclpy_INCLUDE_DIRS}
26-
${tf2_INCLUDE_DIRS}
27-
${bitbots_msgs_INCLUDE_DIRS}
28-
${std_msgs_INCLUDE_DIRS}
29-
${tf2_geometry_msgs_INCLUDE_DIRS}
30-
${std_srvs_INCLUDE_DIRS}
31-
${geometry_msgs_INCLUDE_DIRS}
32-
${bitbots_docs_INCLUDE_DIRS})
33-
include_directories(${INCLUDE_DIRS})
34-
35-
set(LIBRARY_DIRS
36-
${bio_ik_msgs_LIBRARY_DIRS}
37-
${ament_cmake_LIBRARY_DIRS}
38-
${sensor_msgs_LIBRARY_DIRS}
39-
${rclpy_LIBRARY_DIRS}
40-
${tf2_LIBRARY_DIRS}
41-
${bitbots_msgs_LIBRARY_DIRS}
42-
${std_msgs_LIBRARY_DIRS}
43-
${tf2_geometry_msgs_LIBRARY_DIRS}
44-
${std_srvs_LIBRARY_DIRS}
45-
${geometry_msgs_LIBRARY_DIRS}
46-
${bitbots_docs_LIBRARY_DIRS})
47-
48-
link_directories(${LIBRARY_DIRS})
49-
50-
set(LIBS
51-
${bio_ik_msgs_LIBRARIES}
52-
${ament_cmake_LIBRARIES}
53-
${sensor_msgs_LIBRARIES}
54-
${rclpy_LIBRARIES}
55-
${tf2_LIBRARIES}
56-
${bitbots_msgs_LIBRARIES}
57-
${std_msgs_LIBRARIES}
58-
${tf2_geometry_msgs_LIBRARIES}
59-
${std_srvs_LIBRARIES}
60-
${geometry_msgs_LIBRARIES}
61-
${bitbots_docs_LIBRARIES})
62-
63-
include(${CMAKE_BINARY_DIR}/../bitbots_docs/enable_bitbots_docs.cmake)
648
enable_bitbots_docs()
659

66-
ament_export_dependencies(bio_ik_msgs)
67-
ament_export_dependencies(ament_cmake)
68-
ament_export_dependencies(sensor_msgs)
69-
ament_export_dependencies(rclpy)
70-
ament_export_dependencies(tf2)
71-
ament_export_dependencies(bitbots_msgs)
72-
ament_export_dependencies(std_msgs)
73-
ament_export_dependencies(tf2_geometry_msgs)
74-
ament_export_dependencies(std_srvs)
75-
ament_export_dependencies(geometry_msgs)
76-
ament_export_dependencies(bitbots_docs)
77-
ament_export_include_directories(${INCLUDE_DIRS})
78-
7910
ament_python_install_package(${PROJECT_NAME})
8011

8112
ament_package()

Diff for: ‎bitbots_lowlevel/bitbots_buttons/CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ if(NOT CMAKE_CXX_STANDARD)
66
set(CMAKE_CXX_STANDARD 17)
77
endif()
88

9+
# Build with release optimizations and debug symbols by default
10+
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
11+
set(CMAKE_BUILD_TYPE RelWithDebug)
12+
endif()
13+
914
find_package(ament_cmake REQUIRED)
1015
find_package(backward_ros REQUIRED)
1116
find_package(bitbots_docs REQUIRED)

Diff for: ‎bitbots_lowlevel/bitbots_ros_control/CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ if(NOT CMAKE_CXX_STANDARD)
66
set(CMAKE_CXX_STANDARD 17)
77
endif()
88

9+
# Build with release optimizations and debug symbols by default
10+
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
11+
set(CMAKE_BUILD_TYPE RelWithDebug)
12+
endif()
13+
914
find_package(ament_cmake REQUIRED)
1015
find_package(backward_ros REQUIRED)
1116
find_package(bitbots_buttons REQUIRED)

Diff for: ‎bitbots_misc/bitbots_basler_camera/CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ if(NOT CMAKE_CXX_STANDARD)
66
set(CMAKE_CXX_STANDARD 17)
77
endif()
88

9+
# Build with release optimizations and debug symbols by default
10+
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
11+
set(CMAKE_BUILD_TYPE RelWithDebug)
12+
endif()
13+
914
find_package(ament_cmake REQUIRED)
1015
find_package(ament_index_cpp REQUIRED)
1116
find_package(backward_ros REQUIRED)

Diff for: ‎bitbots_misc/bitbots_extrinsic_calibration/CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ if(NOT CMAKE_CXX_STANDARD)
66
set(CMAKE_CXX_STANDARD 17)
77
endif()
88

9+
# Build with release optimizations and debug symbols by default
10+
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
11+
set(CMAKE_BUILD_TYPE RelWithDebug)
12+
endif()
13+
914
find_package(geometry_msgs REQUIRED)
1015
find_package(rclcpp REQUIRED)
1116
find_package(ament_cmake REQUIRED)

Diff for: ‎bitbots_misc/bitbots_robot_description/CMakeLists.txt

-6
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ project(bitbots_robot_description)
44
find_package(bitbots_docs REQUIRED)
55
find_package(ament_cmake REQUIRED)
66

7-
set(INCLUDE_DIRS include)
8-
include_directories(${INCLUDE_DIRS})
9-
10-
set(CMAKE_CXX_STANDARD 17)
11-
add_compile_options(-Wall -Werror -Wno-unused -pedantic -Wextra)
12-
137
enable_bitbots_docs()
148

159
install(DIRECTORY launch DESTINATION share/${PROJECT_NAME})

Diff for: ‎bitbots_misc/bitbots_tf_buffer/CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ if(NOT CMAKE_CXX_STANDARD)
66
set(CMAKE_CXX_STANDARD 17)
77
endif()
88

9+
# Build with release optimizations and debug symbols by default
10+
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
11+
set(CMAKE_BUILD_TYPE RelWithDebug)
12+
endif()
13+
914
set(PYBIND11_PYTHON_VERSION 3)
1015
set(PYBIND11_FINDPYTHON ON)
1116
find_package(ament_cmake REQUIRED)

Diff for: ‎bitbots_misc/bitbots_utils/CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ if(NOT CMAKE_CXX_STANDARD)
66
set(CMAKE_CXX_STANDARD 17)
77
endif()
88

9+
# Build with release optimizations and debug symbols by default
10+
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
11+
set(CMAKE_BUILD_TYPE RelWithDebug)
12+
endif()
13+
914
find_package(bitbots_docs REQUIRED)
1015
find_package(ament_cmake REQUIRED)
1116
find_package(ament_cmake_python REQUIRED)

Diff for: ‎bitbots_motion/bitbots_dynamic_kick/CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ if(NOT CMAKE_CXX_STANDARD)
66
set(CMAKE_CXX_STANDARD 17)
77
endif()
88

9+
# Build with release optimizations and debug symbols by default
10+
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
11+
set(CMAKE_BUILD_TYPE RelWithDebug)
12+
endif()
13+
914
find_package(ament_cmake REQUIRED)
1015
find_package(bitbots_docs REQUIRED)
1116
find_package(biped_interfaces REQUIRED)

Diff for: ‎bitbots_motion/bitbots_dynup/CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ if(NOT CMAKE_CXX_STANDARD)
66
set(CMAKE_CXX_STANDARD 20)
77
endif()
88

9+
# Build with release optimizations and debug symbols by default
10+
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
11+
set(CMAKE_BUILD_TYPE RelWithDebug)
12+
endif()
13+
914
set(PYBIND11_PYTHON_VERSION 3)
1015
set(PYBIND11_FINDPYTHON ON)
1116

Diff for: ‎bitbots_motion/bitbots_hcm/CMakeLists.txt

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
cmake_minimum_required(VERSION 3.5)
22
project(bitbots_hcm)
33

4+
# Build with release optimizations and debug symbols by default
5+
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
6+
set(CMAKE_BUILD_TYPE RelWithDebug)
7+
endif()
8+
49
set(PYBIND11_PYTHON_VERSION 3)
510
set(PYBIND11_FINDPYTHON ON)
611
find_package(ament_cmake REQUIRED)
@@ -19,7 +24,7 @@ find_package(sensor_msgs REQUIRED)
1924
find_package(std_msgs REQUIRED)
2025

2126
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
22-
add_compile_options(-fvisibility=hidden)
27+
add_compile_options(-fvisibility=hidden -Wall -Wextra -Wpedantic)
2328
endif()
2429

2530
include_directories(${PYTHON_INCLUDE_DIRS})

Diff for: ‎bitbots_motion/bitbots_head_mover/CMakeLists.txt

+6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
cmake_minimum_required(VERSION 3.8)
22
project(bitbots_head_mover)
33

4+
5+
# Build with release optimizations and debug symbols by default
6+
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
7+
set(CMAKE_BUILD_TYPE RelWithDebug)
8+
endif()
9+
410
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
511
add_compile_options(-Wall -Wextra -Wpedantic)
612
endif()

Diff for: ‎bitbots_motion/bitbots_moveit_bindings/CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ if(NOT CMAKE_CXX_STANDARD)
66
set(CMAKE_CXX_STANDARD 17)
77
endif()
88

9+
# Build with release optimizations and debug symbols by default
10+
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
11+
set(CMAKE_BUILD_TYPE RelWithDebug)
12+
endif()
13+
914
set(PYBIND11_PYTHON_VERSION 3)
1015
set(PYBIND11_FINDPYTHON ON)
1116
find_package(bitbots_docs REQUIRED)

Diff for: ‎bitbots_motion/bitbots_quintic_walk/CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ if(NOT CMAKE_CXX_STANDARD)
66
set(CMAKE_CXX_STANDARD 20)
77
endif()
88

9+
# Build with release optimizations and debug symbols by default
10+
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
11+
set(CMAKE_BUILD_TYPE RelWithDebug)
12+
endif()
13+
914
set(PYBIND11_PYTHON_VERSION 3)
1015
set(PYBIND11_FINDPYTHON ON)
1116
find_package(ament_cmake REQUIRED)

Diff for: ‎bitbots_motion/bitbots_rl_motion/CMakeLists.txt

-26
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,11 @@
11
cmake_minimum_required(VERSION 3.5)
22
project(bitbots_rl_motion)
33

4-
# Add support for C++17
5-
if(NOT CMAKE_CXX_STANDARD)
6-
set(CMAKE_CXX_STANDARD 17)
7-
endif()
8-
9-
find_package(rclpy REQUIRED)
10-
find_package(std_msgs REQUIRED)
114
find_package(ament_cmake REQUIRED)
125
find_package(bitbots_docs REQUIRED)
136

14-
set(INCLUDE_DIRS ${rclpy_INCLUDE_DIRS} ${std_msgs_INCLUDE_DIRS}
15-
${ament_cmake_INCLUDE_DIRS} ${bitbots_docs_INCLUDE_DIRS})
16-
include_directories(${INCLUDE_DIRS})
17-
18-
set(LIBRARY_DIRS ${rclpy_LIBRARY_DIRS} ${std_msgs_LIBRARY_DIRS}
19-
${ament_cmake_LIBRARY_DIRS} ${bitbots_docs_LIBRARY_DIRS})
20-
21-
link_directories(${LIBRARY_DIRS})
22-
23-
set(LIBS ${rclpy_LIBRARIES} ${std_msgs_LIBRARIES} ${ament_cmake_LIBRARIES}
24-
${bitbots_docs_LIBRARIES})
25-
26-
include(${CMAKE_BINARY_DIR}/../bitbots_docs/enable_bitbots_docs.cmake)
277
enable_bitbots_docs()
288

29-
ament_export_dependencies(rclpy)
30-
ament_export_dependencies(std_msgs)
31-
ament_export_dependencies(ament_cmake)
32-
ament_export_dependencies(bitbots_docs)
33-
ament_export_include_directories(${INCLUDE_DIRS})
34-
359
install(DIRECTORY config DESTINATION share/${PROJECT_NAME})
3610
install(DIRECTORY launch DESTINATION share/${PROJECT_NAME})
3711
install(DIRECTORY rl_walk_models DESTINATION share/${PROJECT_NAME})

Diff for: ‎bitbots_motion/bitbots_splines/CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ if(NOT CMAKE_CXX_STANDARD)
66
set(CMAKE_CXX_STANDARD 17)
77
endif()
88

9+
# Build with release optimizations and debug symbols by default
10+
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
11+
set(CMAKE_BUILD_TYPE RelWithDebug)
12+
endif()
13+
914
find_package(ament_cmake REQUIRED)
1015
find_package(bitbots_docs REQUIRED)
1116
find_package(rclcpp REQUIRED)

Diff for: ‎bitbots_msgs/CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
cmake_minimum_required(VERSION 3.5)
22
project(bitbots_msgs)
33

4+
# Build with release optimizations and debug symbols by default
5+
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
6+
set(CMAKE_BUILD_TYPE RelWithDebug)
7+
endif()
8+
49
find_package(ament_cmake REQUIRED)
510
find_package(rosidl_default_generators REQUIRED)
611
find_package(action_msgs REQUIRED)

Diff for: ‎bitbots_navigation/bitbots_localization/CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ if(NOT CMAKE_CXX_STANDARD)
66
set(CMAKE_CXX_STANDARD 17)
77
endif()
88

9+
# Build with release optimizations and debug symbols by default
10+
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
11+
set(CMAKE_BUILD_TYPE RelWithDebug)
12+
endif()
13+
914
find_package(ament_cmake REQUIRED)
1015
find_package(ament_index_cpp REQUIRED)
1116
find_package(backward_ros REQUIRED)

Diff for: ‎bitbots_navigation/bitbots_odometry/CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ if(NOT CMAKE_CXX_STANDARD)
66
set(CMAKE_CXX_STANDARD 17)
77
endif()
88

9+
# Build with release optimizations and debug symbols by default
10+
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
11+
set(CMAKE_BUILD_TYPE RelWithDebug)
12+
endif()
13+
914
find_package(ament_cmake REQUIRED)
1015
find_package(biped_interfaces REQUIRED)
1116
find_package(bitbots_docs REQUIRED)

Diff for: ‎bitbots_robot/wolfgang_animations/CMakeLists.txt

+1-18
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,11 @@
11
cmake_minimum_required(VERSION 3.5)
22
project(wolfgang_animations)
33

4-
# Add support for C++17
5-
if(NOT CMAKE_CXX_STANDARD)
6-
set(CMAKE_CXX_STANDARD 17)
7-
endif()
8-
94
find_package(ament_cmake REQUIRED)
5+
find_package(bitbots_docs REQUIRED)
106

11-
set(INCLUDE_DIRS ${ament_cmake_INCLUDE_DIRS})
12-
include_directories(${INCLUDE_DIRS})
13-
14-
set(LIBRARY_DIRS ${ament_cmake_LIBRARY_DIRS})
15-
16-
link_directories(${LIBRARY_DIRS})
17-
18-
set(LIBS ${ament_cmake_LIBRARIES})
19-
20-
include(${CMAKE_BINARY_DIR}/../bitbots_docs/enable_bitbots_docs.cmake)
217
enable_bitbots_docs()
228

23-
ament_export_dependencies(ament_cmake)
24-
ament_export_include_directories(${INCLUDE_DIRS})
25-
269
install(DIRECTORY animations DESTINATION share/${PROJECT_NAME})
2710

2811
ament_package()

0 commit comments

Comments
 (0)