From cf2109e016c24ea161b923cf99e6993ea0fb9ce6 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Wed, 3 Apr 2019 21:45:45 +0100 Subject: [PATCH] Change opencv to optional --- CMakeLists.txt | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7fd71ff..09fb7de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,10 +104,18 @@ ENDIF() OPTION( USE_OPENCV "Add OpenCV support" ON ) IF( USE_OPENCV ) - LIST(APPEND OPENCV_MODULES core highgui imgproc video videoio ) - FIND_PACKAGE( OpenCV REQUIRED core highgui imgproc video ) - FIND_PACKAGE( OpenCV COMPONENTS videoio ) - SET(USE_OPENCV ${OpenCV_FOUND}) + + FIND_PACKAGE( OpenCV COMPONENTS core highgui imgproc video ) + IF( ${OpenCV_FOUND} ) + SET(USE_OPENCV TRUE ) + LIST(APPEND OPENCV_MODULES core highgui imgproc video ) + FIND_PACKAGE( OpenCV COMPONENTS videoio ) + IF( ${OPENCV_VIDEOIO_FOUND} ) + LIST(APPEND OPENCV_MODULES videoio ) + ENDIF() + ELSE() + SET(USE_OPENCV FALSE ) + ENDIF() ENDIF() SET_PACKAGE_PROPERTIES(OpenCV PROPERTIES URL "http://opencv.willowgarage.com" DESCRIPTION "OpenCV library support in CalypFrame" TYPE OPTIONAL)