Skip to content

Clean OpenSSL dependencies #514

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 4 commits into from
Jun 28, 2021
Merged

Clean OpenSSL dependencies #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b9d956
Add open ssl as build depend
Jun 24, 2021
3c30661
Clean OpenSSL depends
Jun 25, 2021
c1faf4b
Merge branch 'main' into pr-fix_openssl
Jun 28, 2021
bd012c3
Remove redundant line
henningkayser Jun 28, 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
3 changes: 1 addition & 2 deletions moveit_ros/warehouse/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,11 @@ find_package(warehouse_ros REQUIRED)
find_package(moveit_ros_planning REQUIRED)
find_package(tf2_eigen REQUIRED)
find_package(tf2_ros REQUIRED)
find_package(OpenSSL)

# Finds Boost Components
include(ConfigExtras.cmake)

include_directories(warehouse/include ${OPENSSL_INCLUDE_DIR})
include_directories(warehouse/include)

add_subdirectory(warehouse)

Expand Down
1 change: 0 additions & 1 deletion moveit_ros/warehouse/warehouse/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ add_library(${MOVEIT_LIB_NAME} SHARED
)
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION "${${PROJECT_NAME}_VERSION}")
ament_target_dependencies(${MOVEIT_LIB_NAME} rclcpp Boost moveit_core warehouse_ros moveit_ros_planning)
target_link_libraries(${MOVEIT_LIB_NAME} ${OPENSSL_CRYPTO_LIBRARY})

add_executable(moveit_warehouse_broadcast src/broadcast.cpp)
ament_target_dependencies(moveit_warehouse_broadcast rclcpp Boost warehouse_ros moveit_ros_planning)
Expand Down