This is an automated email from the ASF dual-hosted git repository. marcoabreu pushed a commit to branch devel-arm in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
commit ed33e5f1bbf7e529081a8f74b7b0337e3bcda85a Author: Pedro Larroy <[email protected]> AuthorDate: Wed Jun 6 17:28:16 2018 +0000 [MXNET-523] Fix build with OpenCV 2 (rpi) --- CMakeLists.txt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 962c738..3e39836 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -321,14 +321,15 @@ endif() # ---[ OpenCV if(USE_OPENCV) - find_package(OpenCV QUIET COMPONENTS core highgui imgproc imgcodecs) + find_package(OpenCV COMPONENTS core highgui imgproc imgcodecs) if(NOT OpenCV_FOUND) # if not OpenCV 3.x, then imgcodecs are not found + message(STATUS "OpenCV imgcodecs missing") find_package(OpenCV REQUIRED COMPONENTS core highgui imgproc) endif() include_directories(SYSTEM ${OpenCV_INCLUDE_DIRS}) list(APPEND mxnet_LINKER_LIBS ${OpenCV_LIBS}) message(STATUS " OpenCV_LIBS=${OpenCV_LIBS}") - message(STATUS "OpenCV found (${OpenCV_CONFIG_PATH})") + message(STATUS "OpenCV ${OpenCV_VERSION} found (${OpenCV_CONFIG_PATH})") add_definitions(-DMXNET_USE_OPENCV=1) else(USE_OPENCV) message(STATUS "OpenCV Disabled") @@ -652,20 +653,22 @@ if(USE_PLUGINS_WARPCTC) endif() -if(USE_OPENCV) +if(USE_OPENCV AND OpenCV_VERSION_MAJOR GREATER 2) add_executable(im2rec "tools/im2rec.cc") if(MSVC) target_link_libraries(im2rec mxnet) else() - target_link_libraries(im2rec ${BEGIN_WHOLE_ARCHIVE} mxnet_static ${END_WHOLE_ARCHIVE}) - endif() - target_link_libraries(im2rec + target_link_libraries(im2rec ${BEGIN_WHOLE_ARCHIVE} mxnet_static ${END_WHOLE_ARCHIVE} ${mxnet_LINKER_LIBS} ${OpenCV_LIBS} dmlc ${nnvm_LINKER_LIBS} ${pslite_LINKER_LIBS} ) + endif() +else() + message(WARNING "OpenCV_VERSION_MAJOR: ${OpenCV_VERSION_MAJOR}, version 3 with imgcodecs \ + is required for im2rec, im2rec will not be available") endif() target_link_libraries(mxnet PUBLIC dmlc) -- To stop receiving notification emails like this one, please contact [email protected].
