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

Fix libcurl linkage on Windows (backport #2983) #2984

Merged
merged 1 commit into from
Jun 10, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 10, 2024

See msys2/MINGW-packages#21028

No idea about the MSVC + Conan stuff though - looks like GitHub removed a whole bunch of MSVC toolchains from their runners recently?


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

@mergify mergify bot added the conflicts label Jun 10, 2024
Copy link
Contributor Author

mergify bot commented Jun 10, 2024

Cherry-pick of abaffbc has failed:

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

You are currently cherry-picking commit abaffbc7c.
  (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
	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

(cherry picked from commit abaffbc)

# Conflicts:
#	samples/CMakeLists.txt
#	src/CMakeLists.txt
@kmilos kmilos force-pushed the mergify/bp/0.28.x/pr-2983 branch from 531e0d6 to 3e7c387 Compare June 10, 2024 15:46
@kmilos kmilos added CMake Configuration issues related with CMake windows Windows Specific issues build and removed conflicts labels Jun 10, 2024
@kmilos kmilos added this to the v0.28.3 milestone Jun 10, 2024
@kmilos kmilos merged commit cb53476 into 0.28.x Jun 10, 2024
50 of 61 checks passed
@mergify mergify bot deleted the mergify/bp/0.28.x/pr-2983 branch June 10, 2024 16:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build CMake Configuration issues related with CMake windows Windows Specific issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant