Update sip_helper to use python header dirs #12
Conversation
This fixes ros-visualization/qt_gui_core#46 and ros-visualization/rviz#788; needed at least on OS X, likely some other platforms as well.
| @@ -7,6 +7,7 @@ set(__PYTHON_QT_BINDING_SIP_HELPER_DIR ${CMAKE_CURRENT_LIST_DIR}) | |||
|
|
|||
| find_package(PythonInterp REQUIRED) | |||
| assert(PYTHON_EXECUTABLE) | |||
| find_package(PythonLibs "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" REQUIRED) | |||
There was a problem hiding this comment.
Can you please add the folllowing line before this:
set(Python_ADDITIONAL_VERSIONS "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
It ensures that find_package() is able to find the specified Python version - even if the version number is unknown in the PythonLibs CMake config file.
|
Addressed your comment and also added the specific version for PythonInterp. |
|
Great, thanks for the patch. |
Update sip_helper to use python header dirs
|
I see you released this for indigo. Can we get it into hydro as well? Or is this on the agenda already? |
|
When several days have past after an Indigo release of a repo I will consider all patches for backport to Hydro. The idea is that if any regressions appear on Indigo it doesn't effect Hydro immediately. This one can definitely be backported. Update: it has been released into Hydro in ros/rosdistro@240e1aa |
Changes since 0.2.11: 0.2.14 (2014-07-10) ------------------- * add Python_ADDITIONAL_VERSIONS and ask for specific version of PythonInterp * fix finding specific version of PythonLibs with CMake 3 (`#11 <https://github.com/ros-visualization/python_qt_binding/issues/11>`_) * fix sip_helper to use python header dirs on OS X (`#12 <https://github.com/ros-visualization/python_qt_binding/issues/12>`_) 0.2.13 (2014-05-07) ------------------- * fix sip arguments when path contains spaces 0.2.12 (2014-01-08) ------------------- * python 3 compatibility * fix sip bindings when paths contain spaces (`#9 <https://github.com/ros-visualization/python_qt_binding/issues/9>`_)
This fixes ros-visualization/qt_gui_core#46 and ros-visualization/rviz#788; needed at least on OS X, likely some other platforms as well.