fix(cv): 4.x error , add macro shield part

This commit is contained in:
TinyOh 2019-02-13 10:47:39 +08:00
parent 63e9dda1b2
commit 5d5dc0b7aa

View File

@ -130,7 +130,15 @@ endif()
## camodocal ## camodocal
if(WITH_CAM_MODELS AND (NOT WITH_OPENCV4)) if(WITH_OPENCV4)
message(STATUS "opencv4 calib models not supported")
include_directories(
src/mynteye/api/camodocal/include
)
ADD_DEFINITIONS(-DWITH_CAM_MODELS=OFF)
endif()
if(WITH_CAM_MODELS)
set(EIGEN_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty) set(EIGEN_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty)
message(STATUS "EIGEN_INCLUDE_DIR: ${EIGEN_INCLUDE_DIR}") message(STATUS "EIGEN_INCLUDE_DIR: ${EIGEN_INCLUDE_DIR}")
@ -220,7 +228,7 @@ if(WITH_API)
src/mynteye/api/processor/rectify_processor_ocv.cc src/mynteye/api/processor/rectify_processor_ocv.cc
src/mynteye/api/config.cc src/mynteye/api/config.cc
) )
if(WITH_CAM_MODELS AND (NOT WITH_OPENCV4)) if(WITH_CAM_MODELS)
list(APPEND MYNTEYE_SRCS list(APPEND MYNTEYE_SRCS
src/mynteye/api/processor/depth_processor.cc src/mynteye/api/processor/depth_processor.cc
src/mynteye/api/processor/points_processor.cc src/mynteye/api/processor/points_processor.cc