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

CMake: Fix building samples without webready (backport #2963) #2973

Merged
merged 1 commit into from
May 17, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 17, 2024

If EXIV2_ENABLE_WEBREADY is false, the conntest sample can't be built, as its code depends on Exiv2::http which doesn't exist in a non-webready build.

Fixes #2961


This is an automatic backport of pull request #2963 done by [Mergify](https://mergify.com).

Copy link
Contributor Author

mergify bot commented May 17, 2024

Cherry-pick of 79eb767 has failed:

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

You are currently cherry-picking commit 79eb7675d.
  (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:   samples/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

@kmilos kmilos force-pushed the mergify/bp/0.28.x/pr-2963 branch from f4df7d2 to 25e1090 Compare May 17, 2024 08:00
@kmilos kmilos added CMake Configuration issues related with CMake and removed conflicts labels May 17, 2024
@kmilos kmilos added this to the v0.28.3 milestone May 17, 2024
@kmilos kmilos merged commit ad3e0f9 into 0.28.x May 17, 2024
60 of 61 checks passed
@mergify mergify bot deleted the mergify/bp/0.28.x/pr-2963 branch May 17, 2024 08:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CMake Configuration issues related with CMake
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants