search

ros-visualization / python_qt_binding

http://wiki.ros.org/python_qt_binding
BSD 3-Clause "New" or "Revised" License
34 stars 54 forks source link

update cmake version (backport #139) #140

Closed mergify[bot] closed 6 months ago

mergify[bot] commented 6 months ago

This PR https://github.com/ros-visualization/python_qt_binding/pull/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.

mergify[bot] commented 6 months ago

Cherry-pick of 4fe5bceb353f5dfcef4f78f9266c0983521bd7ac 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

clalancette commented 6 months ago

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