From 55fa7f327ff0060db5709d3b9f5097b882a11b55 Mon Sep 17 00:00:00 2001 From: Kenji Brameld Date: Sat, 17 Sep 2022 10:26:51 +0000 Subject: [PATCH] Revert "Use Boost::python3 if Boost < 1.67 (#422)" This reverts commit f54a26960e14b7507b60e6263c3f1f89f68139ec. Signed-off-by: Kenji Brameld (cherry picked from commit 822069cfaa1384042c77cc242d5408453f978d96) --- cv_bridge/CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cv_bridge/CMakeLists.txt b/cv_bridge/CMakeLists.txt index c909dd148..83f550e30 100644 --- a/cv_bridge/CMakeLists.txt +++ b/cv_bridge/CMakeLists.txt @@ -25,12 +25,10 @@ else() # Resolution for newer versions: # https://gitlab.kitware.com/cmake/cmake/issues/16391 set(_Boost_PYTHON3_HEADERS "boost/python.hpp") - find_package(Boost REQUIRED COMPONENTS python3) - set(boost_python_target "Boost::python3") - else() - find_package(Boost REQUIRED COMPONENTS python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}) - set(boost_python_target "Boost::python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}") endif() + find_package(Python3 REQUIRED COMPONENTS Development NumPy) + find_package(Boost REQUIRED COMPONENTS python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}) + set(boost_python_target "Boost::python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}") endif() find_package(rcpputils REQUIRED)