Skip to content
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

OpenCV4 Support. Take 57 #321

Closed
wants to merge 4 commits into from
Closed

OpenCV4 Support. Take 57 #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
86a1320
Add OpenCV4 support
solosito Nov 29, 2019
fe158fe
cherry-pick into melodic
OAkyildiz Feb 28, 2020
0abf127
Merge branch 'solosito-changes' into melodic
OAkyildiz Feb 28, 2020
10cb37f
removed extra files
OAkyildiz Feb 28, 2020
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
11 changes: 7 additions & 4 deletions cv_bridge/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.5)
project(cv_bridge)

find_package(catkin REQUIRED COMPONENTS rosconsole sensor_msgs)
Expand All @@ -11,9 +11,11 @@ if(NOT ANDROID)
find_package(Boost REQUIRED python3)
endif()
else()
find_package(Boost REQUIRED)
find_package(Boost REQUIRED)
endif()
find_package(OpenCV 3 REQUIRED

find_package(sensor_msgs REQUIRED)
find_package(OpenCV REQUIRED
COMPONENTS
opencv_core
opencv_imgproc
Expand All @@ -34,8 +36,9 @@ catkin_python_setup()
include_directories(include ${Boost_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})

if(NOT ANDROID)
add_subdirectory(python)
add_subdirectory(python)
endif()

add_subdirectory(src)
if(CATKIN_ENABLE_TESTING)
add_subdirectory(test)
Expand Down
8 changes: 5 additions & 3 deletions cv_bridge/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,12 @@ if (PYTHON_VERSION_MAJOR VERSION_EQUAL 3)
add_definitions(-DPYTHON3)
endif()

if (OpenCV_VERSION_MAJOR VERSION_EQUAL 3)
add_library(${PROJECT_NAME}_boost module.cpp module_opencv3.cpp)
if(OpenCV_VERSION_MAJOR VERSION_EQUAL 4)
add_library(${PROJECT_NAME}_boost module.cpp module_opencv4.cpp)
elseif(OpenCV_VERSION_MAJOR VERSION_EQUAL 3)
add_library(${PROJECT_NAME}_boost module.cpp module_opencv3.cpp)
else()
add_library(${PROJECT_NAME}_boost module.cpp module_opencv2.cpp)
add_library(${PROJECT_NAME}_boost module.cpp module_opencv2.cpp)
endif()
target_link_libraries(${PROJECT_NAME}_boost ${Boost_LIBRARIES}
${catkin_LIBRARIES}
Expand Down
Loading