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

Change internal include path of nlohmann/json header file #2808

Merged
merged 2 commits into from
Aug 9, 2022
Merged

Change internal include path of nlohmann/json header file #2808

merged 2 commits into from
Aug 9, 2022

Conversation

rsanchez15
Copy link
Contributor

@rsanchez15 rsanchez15 commented Jul 5, 2022 •
edited
Loading

Description

Contributor Checklist

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

Reviewer Checklist

  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

@JLBuenoLopez
Copy link
Contributor

@rsanchez15, CI is failing to build Fast DDS both in Linux and in Windows (Mac failed before trying to build, cloning the repositories). Please, take a look

@JLBuenoLopez JLBuenoLopez added this to the v2.7.2 milestone Jul 26, 2022
@rsanchez15
Change internal include path of nlohmann/json header file
cfc6c87 
Signed-off-by: RaulSanchez <raul@eprosima.com>
@rsanchez15
Fix include directory in project CMakeLists.txt
799ee24 
Signed-off-by: RaulSanchez <raul@eprosima.com>
@rsanchez15 rsanchez15 force-pushed the feature/nlohmann-json-include branch from e383fb9 to 799ee24 Compare July 26, 2022 15:02
@rsanchez15
Copy link
Contributor Author

@rsanchez15, CI is failing to build Fast DDS both in Linux and in Windows (Mac failed before trying to build, cloning the repositories). Please, take a look

Commit cfc6c87 should fix this

@rsanchez15
Copy link
Contributor Author

@richiprosima Please test this

@EduPonz
Copy link

EduPonz commented Aug 9, 2022

@richiprosima please test this

@EduPonz EduPonz merged commit a1ba98f into master Aug 9, 2022
@EduPonz EduPonz deleted the feature/nlohmann-json-include branch August 9, 2022 14:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@EduPonz EduPonz EduPonz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2.7.2
Development

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