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: Resolve Missing ZLIB Warning When PNG is Disabled (backport #3054) #3055

Merged
merged 1 commit into from
Oct 9, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 9, 2024

closes #3053


This is an automatic backport of pull request #3054 done by Mergify.

@mergify mergify bot added the conflicts label Oct 9, 2024
Copy link
Contributor Author

mergify bot commented Oct 9, 2024

Cherry-pick of 81bc63d has failed:

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

You are currently cherry-picking commit 81bc63d9c.
  (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/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 added the CMake Configuration issues related with CMake label Oct 9, 2024
(cherry picked from commit 81bc63d)

# Conflicts:
#	src/CMakeLists.txt
@kmilos kmilos removed the conflicts label Oct 9, 2024
@kmilos kmilos added this to the v0.28.4 milestone Oct 9, 2024
@kmilos kmilos merged commit 50970ae into 0.28.x Oct 9, 2024
60 of 61 checks passed
@mergify mergify bot deleted the mergify/bp/0.28.x/pr-3054 branch October 9, 2024 10:25
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.

2 participants