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.

Sign up for GitHub

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

Jump to bottom

Fix CHOMP motion planner build on Windows #890

Merged
merged 6 commits into from
Dec 22, 2021
Merged

Fix CHOMP motion planner build on Windows #890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
83747a0
Fix CHOMP motion planner build on Windows
Ace314159 Dec 3, 2021
44973db
Merge branch 'main' into main
Ace314159 Dec 4, 2021
99beba0
Merge branch 'main' into main
JafarAbdi Dec 7, 2021
a1762d1
Merge branch 'main' into main
tylerjw Dec 8, 2021
de561e3
Merge branch 'main' into main
Ace314159 Dec 13, 2021
e2afd3b
Merge branch 'main' into main
tylerjw Dec 13, 2021
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
4 changes: 4 additions & 0 deletions moveit_core/collision_distance_field/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ add_library(${MOVEIT_LIB_NAME} SHARED
src/collision_env_distance_field.cpp
src/collision_env_hybrid.cpp
)
include(GenerateExportHeader)
generate_export_header(${MOVEIT_LIB_NAME})
target_include_directories(${MOVEIT_LIB_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION "${${PROJECT_NAME}_VERSION}")

ament_target_dependencies(${MOVEIT_LIB_NAME}
Expand All @@ -24,6 +27,7 @@ target_link_libraries(${MOVEIT_LIB_NAME}
)

install(DIRECTORY include/ DESTINATION include)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${MOVEIT_LIB_NAME}_export.h DESTINATION include)

if(BUILD_TESTING)
find_package(ament_cmake_gtest REQUIRED)
Expand Down
4 changes: 3 additions & 1 deletion ...tance_field/include/moveit/collision_distance_field/collision_detector_allocator_hybrid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,12 @@
#include <moveit/collision_detection/collision_detector_allocator.h>
#include <moveit/collision_distance_field/collision_env_hybrid.h>

#include "moveit_collision_distance_field_export.h"

namespace collision_detection
{
/** \brief An allocator for Hybrid collision detectors */
class CollisionDetectorAllocatorHybrid
class MOVEIT_COLLISION_DISTANCE_FIELD_EXPORT CollisionDetectorAllocatorHybrid
: public CollisionDetectorAllocatorTemplate<CollisionEnvHybrid, CollisionDetectorAllocatorHybrid>
{
public:
Expand Down