1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40
|
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Sat, 3 Nov 2018 17:27:59 +0100
Subject: Build Python 3 version of cv_bridge
---
CMakeLists.txt | 9 +++++++++
cv_bridge/CMakeLists.txt | 3 ++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea6edcf..7209d0c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,3 +4,12 @@ project(vision_opencv)
add_subdirectory(cv_bridge)
add_subdirectory(image_geometry)
add_subdirectory(opencv_tests)
+
+include(ExternalProject)
+ExternalProject_Add(cv_bridge_python3
+ SOURCE_DIR ${CMAKE_SOURCE_DIR}/cv_bridge
+ INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/cv_bridge_python3
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DPYTHON_VERSION=3 -DCMAKE_PREFIX_PATH=${CMAKE_BINARY_DIR}/devel/
+ INSTALL_COMMAND make DESTDIR=${CMAKE_CURRENT_BINARY_DIR}/cv_bridge_python3 install
+)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cv_bridge_python3/${CMAKE_INSTALL_PREFIX}/ DESTINATION ".")
diff --git a/cv_bridge/CMakeLists.txt b/cv_bridge/CMakeLists.txt
index 997bef3..c643065 100644
--- a/cv_bridge/CMakeLists.txt
+++ b/cv_bridge/CMakeLists.txt
@@ -8,7 +8,8 @@ if(NOT ANDROID)
if(PYTHONLIBS_VERSION_STRING VERSION_LESS 3)
find_package(Boost REQUIRED python)
else()
- find_package(Boost REQUIRED python3)
+ find_package(Python3)
+ find_package(Boost REQUIRED python3${Python3_VERSION_MINOR})
endif()
else()
find_package(Boost REQUIRED)
|