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

libINIReader depends on libinih, the order is important when these libraries are static libraries (backport #3024) #3030

Merged
merged 1 commit into from
Aug 27, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 16, 2024

close #2965


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

@mergify mergify bot added the conflicts label Aug 16, 2024
Copy link
Contributor Author

mergify bot commented Aug 16, 2024

Cherry-pick of 75c12fb has failed:

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

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

…braries are static libraries

(cherry picked from commit 75c12fb)

# Conflicts:
#	src/CMakeLists.txt
@kmilos kmilos merged commit adb7f34 into 0.28.x Aug 27, 2024
62 checks passed
@mergify mergify bot deleted the mergify/bp/0.28.x/pr-3024 branch August 27, 2024 15:35
@kmilos kmilos added this to the v0.28.4 milestone Sep 2, 2024
@kmilos kmilos added the CMake Configuration issues related with CMake label Sep 2, 2024
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