Skip to content

Commit b54f53e

Browse files
committed
Rely on CXXFLAGS definition from moveit_common package
1 parent b3d20cd commit b54f53e

File tree

6 files changed

+11
-6
lines changed

6 files changed

+11
-6
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,11 @@ jobs:
2020
matrix:
2121
env:
2222
- IMAGE: humble-source
23-
CXXFLAGS: >-
24-
-Werror -Wall -Wextra -Wwrite-strings -Wunreachable-code -Wpointer-arith
2523
- IMAGE: rolling-source
2624
NAME: ccov
2725
TARGET_CMAKE_ARGS: -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS="--coverage"
2826
- IMAGE: rolling-source
2927
CLANG_TIDY: pedantic
30-
CXXFLAGS: >-
31-
-Werror -Wall -Wextra -Wwrite-strings -Wunreachable-code -Wpointer-arith
3228
- IMAGE: rolling-source
3329
NAME: asan
3430
# Add fast_unwind_on_malloc=0 to fix stacktraces being too short or do not make sense
@@ -46,6 +42,7 @@ jobs:
4642
UNDERLAY: /root/ws_moveit/install
4743
# TODO: Port to ROS2
4844
# DOWNSTREAM_WORKSPACE: "github:ubi-agni/mtc_demos#master github:TAMS-Group/mtc_pour#master"
45+
TARGET_CMAKE_ARGS: -DCMAKE_BUILD_TYPE=Release
4946
CCACHE_DIR: ${{ github.workspace }}/.ccache
5047
BASEDIR: ${{ github.workspace }}/.work
5148
CACHE_PREFIX: "${{ matrix.env.IMAGE }}${{ contains(matrix.env.TARGET_CMAKE_ARGS, '--coverage') && '-ccov' || '' }}"

capabilities/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
cmake_minimum_required(VERSION 3.5)
22
project(moveit_task_constructor_capabilities)
33

4-
add_compile_options(-std=c++17)
5-
64
find_package(ament_cmake REQUIRED)
75

86
find_package(Boost REQUIRED)
7+
find_package(moveit_common REQUIRED)
8+
moveit_package()
99
find_package(moveit_core REQUIRED)
1010
find_package(moveit_ros_move_group REQUIRED)
1111
find_package(moveit_task_constructor_msgs REQUIRED)

core/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ find_package(ament_cmake REQUIRED)
55

66
find_package(Boost REQUIRED)
77
find_package(geometry_msgs REQUIRED)
8+
find_package(moveit_common REQUIRED)
9+
moveit_package()
810
find_package(moveit_core REQUIRED)
911
find_package(moveit_ros_planning REQUIRED)
1012
find_package(moveit_ros_planning_interface REQUIRED)

demo/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ set(CMAKE_CXX_EXTENSIONS OFF)
88
find_package(ament_cmake REQUIRED)
99

1010
find_package(generate_parameter_library REQUIRED)
11+
find_package(moveit_common REQUIRED)
12+
moveit_package()
1113
find_package(moveit_core REQUIRED)
1214
find_package(moveit_ros_planning REQUIRED)
1315
find_package(moveit_ros_planning_interface REQUIRED)

rviz_marker_tools/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.5)
22
project(rviz_marker_tools)
33

44
find_package(ament_cmake REQUIRED)
5+
find_package(moveit_common REQUIRED)
6+
moveit_package()
57

68
set(THIS_PACKAGE_INCLUDE_DEPENDS
79
eigen3_cmake_module

visualization/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ project(moveit_task_constructor_visualization)
33

44
find_package(ament_cmake REQUIRED)
55
find_package(Boost REQUIRED)
6+
find_package(moveit_common REQUIRED)
7+
moveit_package()
68
find_package(moveit_core REQUIRED)
79
find_package(moveit_ros_visualization REQUIRED)
810
find_package(moveit_task_constructor_core REQUIRED)

0 commit comments

Comments
 (0)