Skip to content

Commit c73e5a3

Browse files
committed
fix build issues
Signed-off-by: Maxime CLEMENT <maxime.clement@tier4.jp>
1 parent 2e03c9b commit c73e5a3

File tree

3 files changed

+2
-61
lines changed

3 files changed

+2
-61
lines changed

simulator/CARLA_Autoware/carla_autoware/resource/carla_autoware

Whitespace-only changes.

simulator/CARLA_Autoware/carla_pointcloud_interface/CMakeLists.txt

+1-48
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,24 @@
11
cmake_minimum_required(VERSION 3.5)
2+
project(carla_pointcloud_interface)
23

34
find_package(autoware_cmake REQUIRED)
45
autoware_package()
56

6-
project(carla_pointcloud_interface)
7-
if(NOT CMAKE_CXX_STANDARD)
8-
set(CMAKE_CXX_STANDARD 14)
9-
endif()
10-
11-
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
12-
add_compile_options(-Wall -Wextra -Wpedantic -Werror)
13-
endif()
14-
15-
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
16-
add_compile_options(-Wno-gnu-anonymous-struct -Wno-nested-anon-types )
17-
endif()
18-
19-
20-
find_package(ament_cmake_auto REQUIRED)
21-
ament_auto_find_build_dependencies()
22-
23-
24-
find_package(Boost COMPONENTS signals)
257
find_package(PCL REQUIRED COMPONENTS common)
268

27-
28-
29-
find_package(PkgConfig REQUIRED)
30-
pkg_check_modules(YAML_CPP REQUIRED yaml-cpp)
31-
find_path(YAML_CPP_INCLUDE_DIR
32-
NAMES yaml_cpp.h
33-
PATHS ${YAML_CPP_INCLUDE_DIRS})
34-
find_library(YAML_CPP_LIBRARY
35-
NAMES YAML_CPP
36-
PATHS ${YAML_CPP_LIBRARY_DIRS})
37-
38-
find_package(OpenCV REQUIRED)
39-
40-
link_directories(${YAML_CPP_LIBRARY_DIRS})
41-
42-
if(NOT ${YAML_CPP_VERSION} VERSION_LESS "0.5")
43-
add_definitions(-DHAVE_NEW_YAMLCPP)
44-
endif(NOT ${YAML_CPP_VERSION} VERSION_LESS "0.5")
45-
469
include_directories(
47-
${OpenCV_INCLUDE_DIRS}
4810
${PCL_COMMON_INCLUDE_DIRS}
4911
)
5012

5113
ament_auto_add_library(carla_pointcloud_interface SHARED
5214
src/carla_pointcloud_interface/carla_pointcloud_interface_node.cpp
5315
)
5416

55-
56-
# workaround to allow deprecated header to build on both galactic and rolling
57-
if(${tf2_geometry_msgs_VERSION} VERSION_LESS 0.18.0)
58-
target_compile_definitions(carla_pointcloud_interface PRIVATE
59-
USE_TF2_GEOMETRY_MSGS_DEPRECATED_HEADER
60-
)
61-
endif()
62-
6317
rclcpp_components_register_node(carla_pointcloud_interface
6418
PLUGIN "PointCloudInterface"
6519
EXECUTABLE carla_pointcloud_interface_node
6620
)
6721

68-
6922
ament_auto_package(
7023
INSTALL_TO_SHARE
7124
launch

simulator/CARLA_Autoware/carla_pointcloud_interface/package.xml

+1-13
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,15 @@
77
<maintainer email="mradityagio@gmail.com">Muhammad Raditya Giovanni</maintainer>
88
<license>Apache License 2.0</license>
99

10-
<buildtool_depend>ament_cmake_auto</buildtool_depend>
10+
<buildtool_depend>autoware_cmake</buildtool_depend>
1111

12-
<depend>angles</depend>
13-
<depend>autoware_auto_control_msgs</depend>
14-
<depend>autoware_auto_vehicle_msgs</depend>
15-
<depend>cv_bridge</depend>
16-
<depend>diagnostic_updater</depend>
17-
<depend>geometry_msgs</depend>
18-
<depend>image_transport</depend>
1912
<depend>libpcl-all-dev</depend>
20-
<depend>message_filters</depend>
21-
<depend>pcl_conversions</depend>
2213
<depend>pcl_ros</depend>
2314
<depend>rclcpp</depend>
2415
<depend>rclcpp_components</depend>
2516
<depend>sensor_msgs</depend>
2617
<depend>tf2</depend>
2718
<depend>tf2_ros</depend>
28-
<depend>velodyne_msgs</depend>
29-
<depend>visualization_msgs</depend>
30-
<depend>yaml-cpp</depend>
3119

3220
<export>
3321
<build_type>ament_cmake</build_type>

0 commit comments

Comments
 (0)