Skip to content

Fix Boost Python 2/3 for old and new Boost. #274

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.

Sign up for GitHub

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

Closed
mikepurvis wants to merge 2 commits into from
Closed

Fix Boost Python 2/3 for old and new Boost. #274

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ca6e0e
Fix Boost Python 2/3 for old and new Boost.
mikepurvis Mar 27, 2019
89cf31c
Fix find_package calls.
mikepurvis Mar 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions cv_bridge/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,19 @@ project(cv_bridge)
find_package(catkin REQUIRED COMPONENTS rosconsole sensor_msgs)

if(NOT ANDROID)
find_package(PythonLibs)
if(PYTHONLIBS_VERSION_STRING VERSION_LESS 3)
find_package(Boost REQUIRED python)
find_package(PythonLibs REQUIRED)
find_package(PythonInterp REQUIRED)
find_package(Boost QUIET)
if(Boost_VERSION LESS 106700)
set(BOOST_PYTHON_COMPONENT_SUFFIX "-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
else()
find_package(Boost REQUIRED python3)
set(BOOST_PYTHON_COMPONENT_SUFFIX "${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
endif()
find_package(Boost REQUIRED COMPONENTS python${BOOST_PYTHON_COMPONENT_SUFFIX})
else()
find_package(Boost REQUIRED)
find_package(Boost REQUIRED)
endif()

find_package(OpenCV 3 REQUIRED
COMPONENTS
opencv_core
Expand Down