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

update cmake version (backport #139) #140

Closed
wants to merge 1 commit into from
Closed

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 25, 2024

This PR #137 introduces a regresion. CMP0148 is new in CMake 3.27. The main CMakeLists.txt is using 3.5, I updated the cmake/shiboken_helper.cmake version to 3.5 too.


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

* Older CMake doesn't have the policy, so skip it there.

Signed-off-by: Alejandro Hernández Cordero <[email protected]>
(cherry picked from commit 4fe5bce)

# Conflicts:
#	cmake/shiboken_helper.cmake
Copy link
Author

mergify bot commented Apr 25, 2024

Cherry-pick of 4fe5bce has failed:

On branch mergify/bp/jazzy/pr-139
Your branch is up to date with 'origin/jazzy'.

You are currently cherry-picking commit 4fe5bce.
  (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:   cmake/shiboken_helper.cmake

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

@mergify mergify bot requested a review from sloretz as a code owner April 25, 2024 12:26
@mergify mergify bot added the conflicts label Apr 25, 2024
@mergify mergify bot mentioned this pull request Apr 25, 2024
@clalancette
Copy link
Contributor

Actually, we haven't merged in #138 yet, so I'm going to close this and cherry-pick the commit into #138 instead.

@clalancette clalancette deleted the mergify/bp/jazzy/pr-139 branch April 25, 2024 12:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants