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

Export more dependencies in CMake config (backport #3094) #3095

Merged
merged 1 commit into from
Jan 4, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 20, 2024

brotli and inih are not included as CMake doesn't ship standard find modules for those

iconv still needs to be handled

Related to #3092

See also #2872


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

@mergify mergify bot added the conflicts label Dec 20, 2024
Copy link
Contributor Author

mergify bot commented Dec 20, 2024

Cherry-pick of f043d0c has failed:

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

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

Changes to be committed:
	modified:   cmake/exiv2Config.cmake.in

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

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 Dec 20, 2024
@kmilos kmilos added this to the v0.28.4 milestone Dec 20, 2024
brotli and inih are not included as CMake doesn't ship standard find modules for those

(cherry picked from commit f043d0c)

# Conflicts:
#	src/CMakeLists.txt
@kmilos kmilos force-pushed the mergify/bp/0.28.x/pr-3094 branch from 6e2842b to 138fcfc Compare January 4, 2025 20:00
@kmilos kmilos removed the conflicts label Jan 4, 2025
@kmilos kmilos merged commit 64743a5 into 0.28.x Jan 4, 2025
62 checks passed
@mergify mergify bot deleted the mergify/bp/0.28.x/pr-3094 branch January 4, 2025 23:15
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

1 participant