Make it compile, remove PointCloud support, and remove boost
- Compiles on Windows with VS2015/VS2017 - Compiles on Mac with clang - Compiles on Linux with gcc - Removed PointCloud support as this is deprecated and might not be needed in ROS 2 - Remove boost as per ROS 2 development guidelines
This commit is contained in:
committed by
Martin Idel
parent
7ad6e21d3d
commit
8fb9c51bf8
@@ -2,6 +2,10 @@ cmake_minimum_required(VERSION 3.5)
|
||||
|
||||
project(laser_geometry)
|
||||
|
||||
if(NOT CMAKE_CXX_STANDARD)
|
||||
set(CMAKE_CXX_STANDARD 14)
|
||||
endif()
|
||||
|
||||
find_package(ament_cmake REQUIRED)
|
||||
|
||||
find_package(angles REQUIRED)
|
||||
@@ -10,9 +14,6 @@ find_package(sensor_msgs REQUIRED)
|
||||
find_package(tf2 REQUIRED)
|
||||
find_package(Eigen3 REQUIRED)
|
||||
|
||||
set(Boost_USE_STATIC_LIBS ON)
|
||||
find_package(Boost REQUIRED)
|
||||
|
||||
# TODO(dhood): enable python support once ported to ROS 2
|
||||
# catkin_python_setup()
|
||||
|
||||
@@ -21,7 +22,6 @@ include_directories(include
|
||||
${rclcpp_INCLUDE_DIRS}
|
||||
${sensor_msgs_INCLUDE_DIRS}
|
||||
${tf2_INCLUDE_DIRS}
|
||||
${Boost_INCLUDE_DIRS}
|
||||
${EIGEN3_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
@@ -34,12 +34,21 @@ target_link_libraries(laser_geometry
|
||||
)
|
||||
|
||||
ament_export_include_directories(include)
|
||||
ament_export_interfaces(laser_geometry)
|
||||
ament_export_libraries(laser_geometry)
|
||||
ament_package(CONFIG_EXTRAS laser_geometry-extras.cmake)
|
||||
|
||||
install(TARGETS laser_geometry
|
||||
install(
|
||||
TARGETS laser_geometry
|
||||
EXPORT laser_geometry
|
||||
ARCHIVE DESTINATION lib
|
||||
LIBRARY DESTINATION lib)
|
||||
install(DIRECTORY include/laser_geometry/
|
||||
DESTINATION include/${PROJECT_NAME}/
|
||||
FILES_MATCHING PATTERN "*.h")
|
||||
LIBRARY DESTINATION lib
|
||||
RUNTIME DESTINATION bin
|
||||
INCLUDES DESTINATION include
|
||||
)
|
||||
|
||||
install(
|
||||
DIRECTORY include/
|
||||
DESTINATION include
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user