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.

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

[18673] Fix version and FastCDR patch file in QNX build files #3531

Merged
merged 3 commits into from
Jun 2, 2023

Conversation

jsan-rt
Copy link
Contributor

@jsan-rt jsan-rt commented May 23, 2023

Description

QNX compilation was broken by eProsima/Fast-CDR#131 due to patch incompatibilities. This PR updates the patch file to match the current CMakeLists.txt and updates the common.mk file to reflect the latest FastDDS version.

@Mergifyio backport 2.10.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • [NA] The code follows the style guidelines of this project.
  • [NA] 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
  • [NA] Any new/modified methods have been properly documented using Doxygen.
  • [NA] Changes are ABI compatible.
  • [NA] Changes are API compatible.
  • [NA] New feature has been added to the versions.md file (if applicable).
  • [NA] 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.
  • [NA] Check CI results: changes do not issue any warning.
  • [NA] Check CI results: failing tests are unrelated with the changes.

jsan-rt added 2 commits May 23, 2023 10:08
Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
@jsan-rt jsan-rt added no-test Skip CI tests if PR marked with this label skip-ci Automatically pass CI labels May 23, 2023
@MiguelCompany MiguelCompany added this to the v2.11.0 milestone May 30, 2023
…f hardcoding it on QNX builds

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
@jsan-rt jsan-rt force-pushed the bugfix/qnx_build branch from 414e576 to e188ad2 Compare May 30, 2023 09:59
@jsan-rt
Copy link
Contributor Author

jsan-rt commented May 30, 2023

Hi @chachoi,

In this PR we are adding on common.mk a way to dynamically generate Fast DDS version from the project's main CMakeLists.txt file instead of having it set statically.

Your input would be appreciated. Do you think this change would work for you?

@chachoi
Copy link
Contributor

chachoi commented May 31, 2023

Hi @jsantiago-eProsima,

That is a great idea. Your change looks good. As far as I know, using grep to extract version number is the only way to know get the version number dynamically in common.mk.

Also, thank you for maintaining the QNX related files.

@MiguelCompany
Copy link
Member

@richiprosima Please test this

@jsan-rt jsan-rt merged commit ea185fc into master Jun 2, 2023
@jsan-rt jsan-rt deleted the bugfix/qnx_build branch June 2, 2023 05:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
no-test Skip CI tests if PR marked with this label skip-ci Automatically pass CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants