Skip to content

Clean OpenSSL dependencies #67

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 1 commit into from
Jun 28, 2021
Merged

Clean OpenSSL dependencies #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ find_package(rclcpp REQUIRED)
find_package(std_msgs REQUIRED)
find_package(warehouse_ros REQUIRED)
find_package(class_loader REQUIRED)
find_package(OpenSSL REQUIRED)
find_package(MONGODB REQUIRED)
find_package(ament_cmake_python REQUIRED)
find_package(rclpy REQUIRED)
Expand Down Expand Up @@ -69,7 +68,6 @@ ament_target_dependencies(${PROJECT_NAME}
std_msgs
warehouse_ros
class_loader
OpenSSL
)
target_link_libraries(${PROJECT_NAME} ${MONGODB_LIBRARIES})

Expand All @@ -78,7 +76,7 @@ if(BUILD_TESTING)
find_package(ament_cmake_gtest REQUIRED)

ament_add_gtest_executable(test_warehouse_ros_mongo_cpp test/test_warehouse_ros_mongo.cpp)
target_link_libraries(test_warehouse_ros_mongo_cpp warehouse_ros_mongo ${GTEST_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARY})
target_link_libraries(test_warehouse_ros_mongo_cpp warehouse_ros_mongo ${GTEST_LIBRARIES})
add_launch_test(test/warehouse_ros_mongo.launch.py
ARGS "test_binary_dir:=$<TARGET_FILE_DIR:test_warehouse_ros_mongo_cpp>")

Expand Down Expand Up @@ -119,7 +117,6 @@ ament_export_dependencies(
std_msgs
warehouse_ros
class_loader
OpenSSL
ament_cmake_python
rclpy
MONGODB
Expand Down
2 changes: 0 additions & 2 deletions package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,13 @@
<buildtool_depend>ament_cmake_python</buildtool_depend>

<build_depend>libmongoclient-dev</build_depend>
<build_depend>libssl-dev</build_depend>

<depend>mongodb</depend>
<depend>warehouse_ros</depend>
<depend>rclcpp</depend>
<depend>std_msgs</depend>
<depend>class_loader</depend>
<depend>rclpy</depend>
<depend>openssl</depend>

<test_depend>launch_testing_ament_cmake</test_depend>
<test_depend>launch_ros</test_depend>
Expand Down