Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Foxy prep fixes #226

Merged
merged 1 commit into from
Jun 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion moveit_core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ find_package(rclcpp REQUIRED)
if(WIN32)
set(EXTRA_BOOST_COMPONENTS zlib)
endif()
find_package(Boost REQUIRED system filesystem date_time thread iostreams ${EXTRA_BOOST_COMPONENTS})
find_package(Boost REQUIRED system filesystem date_time thread iostreams regex ${EXTRA_BOOST_COMPONENTS})

find_package(eigen3_cmake_module REQUIRED)
find_package(Eigen3 REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion moveit_core/planning_interface/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ add_library(${MOVEIT_LIB_NAME} SHARED
)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION "${${PROJECT_NAME}_VERSION}")
ament_target_dependencies(${MOVEIT_LIB_NAME}
moveit_msgs
urdf
visualization_msgs
urdfdom
urdfdom_headers
)
Expand Down
1 change: 0 additions & 1 deletion moveit_ros/occupancy_map_monitor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ ament_target_dependencies(moveit_ros_occupancy_map_server
target_link_libraries(moveit_ros_occupancy_map_server ${MOVEIT_LIB_NAME})

ament_export_include_directories(include)
ament_export_interfaces(${MOVEIT_LIB_NAME} HAS_LIBRARY_TARGET)
ament_export_libraries(${MOVEIT_LIB_NAME})
ament_export_dependencies(rclcpp)
ament_export_dependencies(eigen3_cmake_module)
Expand Down
1 change: 0 additions & 1 deletion moveit_ros/planning/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ set(THIS_PACKAGE_INCLUDE_DEPENDS
tf2_eigen
tf2_ros
Eigen3
moveit_ros_occupancy_map_monitor
moveit_core
# moveit_ros_perception
moveit_ros_occupancy_map_monitor
Expand Down
4 changes: 3 additions & 1 deletion moveit_ros/planning/planning_pipeline/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ add_library(${MOVEIT_LIB_NAME} SHARED src/planning_pipeline.cpp)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION "${${PROJECT_NAME}_VERSION}")

ament_target_dependencies(${MOVEIT_LIB_NAME}
moveit_msgs
rclcpp
Boost)
Boost
)

install(TARGETS ${MOVEIT_LIB_NAME}
ARCHIVE DESTINATION lib
Expand Down