Skip to content

Commit

Permalink
Revert "Use Boost::python3 if Boost < 1.67 (#422)"
Browse files Browse the repository at this point in the history
This reverts commit f54a269.

Signed-off-by: Kenji Brameld <kenjibrameld@gmail.com>
(cherry picked from commit 822069c)
  • Loading branch information
ijnek authored and mergify[bot] committed Sep 17, 2022
1 parent 8445b86 commit 55fa7f3
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions cv_bridge/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 55fa7f3

Please sign in to comment.