Skip to content

update cmake version (backport #139)#140

Closed
mergify[bot] wants to merge 1 commit intojazzyfrom
mergify/bp/jazzy/pr-139
Closed

update cmake version (backport #139)#140
mergify[bot] wants to merge 1 commit intojazzyfrom
mergify/bp/jazzy/pr-139

Conversation

@mergify
Copy link
Copy Markdown

@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.

@ahcorde @mergify
Only suppress Python warnings on new enough CMake (#139)
1220093 
* Older CMake doesn't have the policy, so skip it there.

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
(cherry picked from commit 4fe5bce)

# Conflicts:
#	cmake/shiboken_helper.cmake
@mergify
Copy link
Copy Markdown
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
Merged
@clalancette
Copy link
Copy Markdown
Contributor

clalancette commented Apr 25, 2024

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

Reviewers

@sloretz sloretz Awaiting requested review from sloretz

Assignees

No one assigned

Labels

conflicts

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@clalancette @ahcorde