From 2ca6e0e82e09e64c3bb001b4e428cad536ceca08 Mon Sep 17 00:00:00 2001 From: Mike Purvis Date: Wed, 27 Mar 2019 09:06:55 -0400 Subject: [PATCH 1/2] Fix Boost Python 2/3 for old and new Boost. --- cv_bridge/CMakeLists.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/cv_bridge/CMakeLists.txt b/cv_bridge/CMakeLists.txt index 997bef3e1..c459d3656 100644 --- a/cv_bridge/CMakeLists.txt +++ b/cv_bridge/CMakeLists.txt @@ -3,16 +3,18 @@ project(cv_bridge) find_package(catkin REQUIRED COMPONENTS rosconsole sensor_msgs) +find_package(Boost QUIET) if(NOT ANDROID) - find_package(PythonLibs) - if(PYTHONLIBS_VERSION_STRING VERSION_LESS 3) - find_package(Boost REQUIRED python) + 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 From 89cf31c72390df06e152b7401cbd71909fef6b11 Mon Sep 17 00:00:00 2001 From: Mike Purvis Date: Wed, 27 Mar 2019 20:15:15 -0400 Subject: [PATCH 2/2] Fix find_package calls. --- cv_bridge/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cv_bridge/CMakeLists.txt b/cv_bridge/CMakeLists.txt index c459d3656..160214d5b 100644 --- a/cv_bridge/CMakeLists.txt +++ b/cv_bridge/CMakeLists.txt @@ -3,8 +3,10 @@ project(cv_bridge) find_package(catkin REQUIRED COMPONENTS rosconsole sensor_msgs) -find_package(Boost QUIET) if(NOT ANDROID) + 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()