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 asio dependency #3411

Merged
merged 2 commits into from
Mar 29, 2023
Merged

Fix asio dependency #3411

merged 2 commits into from
Mar 29, 2023

Conversation

JesusPoderoso
Copy link
Contributor

@JesusPoderoso JesusPoderoso commented Mar 28, 2023 •
edited by JLBuenoLopez
Loading

Description

@Mergifyio backport 2.9.x 2.8.x 2.6.x 2.1.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • The code follows the style guidelines of this project.
  • N/A Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
  • N/A Any new/modified methods have been properly documented using Doxygen.
  • Changes are ABI compatible.
  • Changes are API compatible.
  • N/A New feature has been added to the versions.md file (if applicable).
  • N/A New feature has been documented/Current behavior is correctly described in the documentation.
  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • Check contributor checklist is correct.
  • [N/A] Check CI results: changes do not issue any warning.
  • [N/A] Check CI results: failing tests are unrelated with the changes.

@JesusPoderoso JesusPoderoso added the skip-ci Automatically pass CI label Mar 28, 2023
@JesusPoderoso JesusPoderoso added this to the v2.10.0 milestone Mar 28, 2023
JLBuenoLopez
JLBuenoLopez suggested changes Mar 28, 2023
View reviewed changes
examples/cpp/dds/DeadlineQoSExample/deadlinepayloadPubSubMain.cxx
@@ -18,11 +18,9 @@

#include <fastrtps/Domain.h>
#include <fastrtps/log/Log.h>
#include "asio.hpp"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest removing the code in the CMakeLists.txt concerning Asio.

@JLBuenoLopez
Copy link
Contributor

@richiprosima please test this

JLBuenoLopez
JLBuenoLopez approved these changes Mar 28, 2023
View reviewed changes
Copy link
Contributor

@JLBuenoLopez JLBuenoLopez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@JesusPoderoso
Copy link
Contributor Author

@Mergifyio backport 2.9.x 2.8.x 2.6.x 2.1.x

@mergify
Copy link
Contributor

mergify bot commented Mar 28, 2023 •
edited
Loading

backport 2.9.x 2.8.x 2.6.x 2.1.x

✅ Backports have been created

@JLBuenoLopez JLBuenoLopez merged commit 3fa1a2b into master Mar 29, 2023
@JLBuenoLopez JLBuenoLopez deleted the hotfix/asio_dep_example branch March 29, 2023 05:07
mergify bot pushed a commit that referenced this pull request Mar 29, 2023
@JesusPoderoso @mergify
Fix asio dependency (#3411)
f59bcb4 
* Fix unnecessary asio dependency

* Remove asio from CMakeList

(cherry picked from commit 3fa1a2b)
mergify bot pushed a commit that referenced this pull request Mar 29, 2023
@JesusPoderoso @mergify
Fix asio dependency (#3411)
382d6a0 
* Fix unnecessary asio dependency

* Remove asio from CMakeList

(cherry picked from commit 3fa1a2b)
This was referenced Mar 29, 2023
Merged
Merged
mergify bot pushed a commit that referenced this pull request Mar 29, 2023
@JesusPoderoso @mergify
Fix asio dependency (#3411)
de38226 
* Fix unnecessary asio dependency

* Remove asio from CMakeList

(cherry picked from commit 3fa1a2b)
@mergify mergify bot mentioned this pull request Mar 29, 2023
Merged
mergify bot pushed a commit that referenced this pull request Mar 29, 2023
@JesusPoderoso @mergify
Fix asio dependency (#3411)
b5e6976 
* Fix unnecessary asio dependency

* Remove asio from CMakeList

(cherry picked from commit 3fa1a2b)

# Conflicts:
#	examples/C++/DDS/DeadlineQoSExample/CMakeLists.txt
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JLBuenoLopez JLBuenoLopez JLBuenoLopez approved these changes

Assignees

@EduPonz EduPonz

Labels
skip-ci Automatically pass CI
Projects
None yet
Milestone
v2.10.0
Development

Successfully merging this pull request may close these issues.
3 participants
@JesusPoderoso @JLBuenoLopez @EduPonz