Skip to content

Commit

Permalink
fix: remove warning for compile error (autowarefoundation#198)
Browse files Browse the repository at this point in the history
* fix: fix compile error of pointcloud preprocessor

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* fix: fix compiler warning for had map utils

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* fix: fix compiler warning for behavior velocity planner

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* fix: fix compiler warning for compare map segmentation

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* fix: fix compiler warning for occupancy grid map outlier filter

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* fix: fix compiler warning for detection by tracker

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>

* fix: restore comment

Signed-off-by: wep21 <border_goldenmarket@yahoo.co.jp>
  • Loading branch information
wep21 authored Jan 4, 2022
1 parent 077e40c commit 6943ad5
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 12 deletions.
25 changes: 15 additions & 10 deletions common/had_map_utils/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,32 @@ cmake_minimum_required(VERSION 3.5)
### Export headers
project(had_map_utils)

if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 14)
endif()

if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall -Wextra -Wpedantic -Werror)
endif()

find_package(ament_cmake_auto REQUIRED)
find_package(CGAL REQUIRED COMPONENTS Core)
#find_package(Eigen3 REQUIRED)
find_package(Eigen3 REQUIRED)
ament_auto_find_build_dependencies()

# Disable warnings due to external dependencies (Eigen)
#include_directories(SYSTEM ${EIGEN3_INCLUDE_DIR})

ament_auto_add_library(${PROJECT_NAME} SHARED
include/had_map_utils/had_map_utils.hpp
include/had_map_utils/had_map_computation.hpp
include/had_map_utils/had_map_conversion.hpp
include/had_map_utils/had_map_query.hpp
include/had_map_utils/had_map_visualization.hpp
include/had_map_utils/visibility_control.hpp
src/had_map_utils.cpp
src/had_map_computation.cpp
src/had_map_conversion.cpp
src/had_map_query.cpp
src/had_map_visualization.cpp)

# Disable warnings due to external dependencies (Eigen)
target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC
${EIGEN3_INCLUDE_DIR}
${rclcpp_INCLUDE_DIRS}
)

set(CGAL_DO_NOT_WARN_ABOUT_CMAKE_BUILD_TYPE TRUE)
target_link_libraries(${PROJECT_NAME} CGAL CGAL::CGAL CGAL::CGAL_Core)
autoware_set_compile_options(${PROJECT_NAME})
Expand Down
1 change: 1 addition & 0 deletions perception/compare_map_segmentation/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ ament_auto_find_build_dependencies()

include_directories(
include
SYSTEM
${Boost_INCLUDE_DIRS}
${PCL_INCLUDE_DIRS}
${EIGEN3_INCLUDE_DIRS}
Expand Down
1 change: 1 addition & 0 deletions perception/detection_by_tracker/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ ament_auto_find_build_dependencies()

include_directories(
include
SYSTEM
${PCL_COMMON_INCLUDE_DIRS}
${PCL_INCLUDE_DIRS}
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ ament_auto_find_build_dependencies()

include_directories(
include
SYSTEM
${Boost_INCLUDE_DIRS}
${PCL_INCLUDE_DIRS}
${EIGEN3_INCLUDE_DIRS}
Expand Down
6 changes: 6 additions & 0 deletions planning/behavior_velocity_planner/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ ament_auto_add_library(scene_module_lib SHARED
src/utilization/interpolate.cpp
)

target_include_directories(scene_module_lib
SYSTEM PUBLIC
${BOOST_INCLUDE_DIRS}
${tf2_geometry_msgs_INCLUDE_DIRS}
)

target_include_directories(scene_module_lib
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
Expand Down
1 change: 1 addition & 0 deletions sensing/pointcloud_preprocessor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ ament_auto_find_build_dependencies()

include_directories(
include
SYSTEM
${Boost_INCLUDE_DIRS}
${PCL_INCLUDE_DIRS}
${EIGEN3_INCLUDE_DIRS}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ rcl_interfaces::msg::SetParametersResult PassThroughFilterUInt16Component::param
}

// Check the current value for keep_organized
bool keep_organized;
bool keep_organized{get_parameter("keep_organized").as_bool()};
get_param(p, "keep_organized", keep_organized);
if (impl_.getKeepOrganized() != keep_organized) {
RCLCPP_DEBUG(
Expand All @@ -105,7 +105,7 @@ rcl_interfaces::msg::SetParametersResult PassThroughFilterUInt16Component::param
}

// Check the current value for the negative flag
bool filter_limit_negative;
bool filter_limit_negative{get_parameter("filter_limit_negative").as_bool()};
get_param(p, "filter_limit_negative", filter_limit_negative);
if (impl_.getFilterLimitsNegative() != filter_limit_negative) {
RCLCPP_DEBUG(
Expand Down

0 comments on commit 6943ad5

Please sign in to comment.