From 6b9d956702c16cccc006c1b34c5a12ae078e9963 Mon Sep 17 00:00:00 2001 From: Vatan Aksoy Tezer Date: Fri, 25 Jun 2021 02:29:46 +0300 Subject: [PATCH 1/3] Add open ssl as build depend --- moveit_ros/warehouse/package.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/moveit_ros/warehouse/package.xml b/moveit_ros/warehouse/package.xml index f962f65ab5..0824bd6d9a 100644 --- a/moveit_ros/warehouse/package.xml +++ b/moveit_ros/warehouse/package.xml @@ -16,6 +16,7 @@ ament_cmake moveit_common + libssl-dev rclcpp moveit_core From 3c30661a9f7ebd47624790b836598bcb73606d48 Mon Sep 17 00:00:00 2001 From: Vatan Aksoy Tezer Date: Fri, 25 Jun 2021 12:37:05 +0000 Subject: [PATCH 2/3] Clean OpenSSL depends --- moveit_ros/warehouse/CMakeLists.txt | 3 +-- moveit_ros/warehouse/package.xml | 1 - moveit_ros/warehouse/warehouse/CMakeLists.txt | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/moveit_ros/warehouse/CMakeLists.txt b/moveit_ros/warehouse/CMakeLists.txt index b80a56c098..eeb3dd3e01 100644 --- a/moveit_ros/warehouse/CMakeLists.txt +++ b/moveit_ros/warehouse/CMakeLists.txt @@ -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) diff --git a/moveit_ros/warehouse/package.xml b/moveit_ros/warehouse/package.xml index 0824bd6d9a..f962f65ab5 100644 --- a/moveit_ros/warehouse/package.xml +++ b/moveit_ros/warehouse/package.xml @@ -16,7 +16,6 @@ ament_cmake moveit_common - libssl-dev rclcpp moveit_core diff --git a/moveit_ros/warehouse/warehouse/CMakeLists.txt b/moveit_ros/warehouse/warehouse/CMakeLists.txt index b407850d35..e31e708809 100644 --- a/moveit_ros/warehouse/warehouse/CMakeLists.txt +++ b/moveit_ros/warehouse/warehouse/CMakeLists.txt @@ -11,7 +11,7 @@ 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}) +target_link_libraries(${MOVEIT_LIB_NAME}) add_executable(moveit_warehouse_broadcast src/broadcast.cpp) ament_target_dependencies(moveit_warehouse_broadcast rclcpp Boost warehouse_ros moveit_ros_planning) From bd012c3346b9d75228eebe0e26f63c8c6fca243b Mon Sep 17 00:00:00 2001 From: Henning Kayser Date: Mon, 28 Jun 2021 23:44:43 +0200 Subject: [PATCH 3/3] Remove redundant line --- moveit_ros/warehouse/warehouse/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/moveit_ros/warehouse/warehouse/CMakeLists.txt b/moveit_ros/warehouse/warehouse/CMakeLists.txt index e31e708809..ccba905b88 100644 --- a/moveit_ros/warehouse/warehouse/CMakeLists.txt +++ b/moveit_ros/warehouse/warehouse/CMakeLists.txt @@ -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}) add_executable(moveit_warehouse_broadcast src/broadcast.cpp) ament_target_dependencies(moveit_warehouse_broadcast rclcpp Boost warehouse_ros moveit_ros_planning)