Skip to content

[22341] Fix cmake generator evaluation (backport #251)#252

Closed
mergify[bot] wants to merge 1 commit into1.0.xfrom
mergify/bp/1.0.x/pr-251
Closed

[22341] Fix cmake generator evaluation (backport #251)#252
mergify[bot] wants to merge 1 commit into1.0.xfrom
mergify/bp/1.0.x/pr-251

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify Bot commented Nov 29, 2024

Description

This PR adds an extra check before checking checking the target properties. This fix should solve the issue linked in the task.

@Mergifyio backport 1.0.x

Fixes eProsima/Fast-DDS#5283

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 backport compatible: they do NOT break ABI nor change library core behavior.
  • Changes are API compatible.
  • N/A New feature has been added to the versions.md file (if applicable).
  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: CI pass and failing tests are unrelated with the changes.
This is an automatic backport of pull request #251 done by [Mergify](https://mergify.com).

@Mario-DL @mergify
Fix cmake generator evaluation (#251)
cd5bf5b 
Signed-off-by: Mario Dominguez <[email protected]>
(cherry picked from commit 0cb11a4)

# Conflicts:
#	src/cpp/CMakeLists.txt
@mergify
Copy link
Copy Markdown
Author

mergify Bot commented Nov 29, 2024

Cherry-pick of 0cb11a4 has failed:

On branch mergify/bp/1.0.x/pr-251
Your branch is up to date with 'origin/1.0.x'.

You are currently cherry-picking commit 0cb11a4.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/CMakeLists.txt

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify Bot added the conflicts label Nov 29, 2024
@mergify mergify Bot mentioned this pull request Nov 29, 2024
Merged
10 tasks
@MiguelCompany MiguelCompany deleted the mergify/bp/1.0.x/pr-251 branch November 29, 2024 11:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

conflicts

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@MiguelCompany @Mario-DL