Skip to content

Fix overriding binary install #2008

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

Merged
henningkayser merged 5 commits into from
Mar 15, 2023
Merged

Fix overriding binary install #2008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c80852a
initial test commit
abhijelly Mar 11, 2023
641d48d
INCLUDES DESTINATION directive done
abhijelly Mar 11, 2023
74c9de5
install command done
abhijelly Mar 11, 2023
21fb604
resolved review comments
abhijelly Mar 14, 2023
0d0b648
Update moveit_py/src/moveit/moveit_py_utils/CMakeLists.txt
henningkayser Mar 15, 2023
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_planners/ompl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ install(TARGETS moveit_ompl_interface moveit_ompl_planner_plugin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
RUNTIME DESTINATION bin
INCLUDES DESTINATION include
INCLUDES DESTINATION include/moveit_planners_ompl
)
ament_export_targets(${PROJECT_NAME}Targets HAS_LIBRARY_TARGET)
ament_export_dependencies(moveit_core ompl)
Expand Down
2 changes: 1 addition & 1 deletion moveit_planners/ompl/ompl_interface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ target_link_libraries(moveit_ompl_planner_plugin moveit_ompl_interface)
install(TARGETS moveit_generate_state_database
RUNTIME DESTINATION lib/${PROJECT_NAME}
)
install(DIRECTORY include/ DESTINATION include)
install(DIRECTORY include/ DESTINATION include/moveit_planners)

if(BUILD_TESTING)
find_package(ament_cmake_gtest REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion moveit_planners/test_configs/prbt_ikfast_manipulator_plugin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ install(
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
RUNTIME DESTINATION bin
INCLUDES DESTINATION include
INCLUDES DESTINATION include/moveit_resources_prbt_ikfast_manipulator_plugin
)

ament_export_targets(${PROJECT_NAME}Targets HAS_LIBRARY_TARGET)
Expand Down
2 changes: 1 addition & 1 deletion moveit_py/src/moveit/moveit_py_utils/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ install(
ARCHIVE DESTINATION lib
RUNTIME DESTINATION bin)

install(DIRECTORY include/ DESTINATION include)
install(DIRECTORY include/ DESTINATION include/moveit_py)