From e18dadfca994ffa3ecb161a38906e9fd38a07c7b Mon Sep 17 00:00:00 2001 From: Josh Klontz Date: Thu, 3 Dec 2015 16:39:18 -0500 Subject: [PATCH] Introduced BR_WITH_OPENCV_OBJDETECT --- CMakeLists.txt | 2 +- openbr/plugins/cmake/opencv.cmake | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d8047ea..d068a3a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,7 +86,7 @@ set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${Qt5Core_QTMAIN_LIBRARIES}) # Find OpenCV find_package(OpenCV 2.4.5 REQUIRED) -set(OPENCV_DEPENDENCIES opencv_core opencv_highgui opencv_imgproc opencv_ml opencv_objdetect) +set(OPENCV_DEPENDENCIES opencv_core opencv_highgui opencv_imgproc opencv_ml) set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${OPENCV_DEPENDENCIES}) # Find Alphanum diff --git a/openbr/plugins/cmake/opencv.cmake b/openbr/plugins/cmake/opencv.cmake index e6a0d08..8e937db 100644 --- a/openbr/plugins/cmake/opencv.cmake +++ b/openbr/plugins/cmake/opencv.cmake @@ -35,6 +35,16 @@ else() plugins/imgproc/sift.cpp) endif() +option(BR_WITH_OPENCV_OBJDETECT "Build with OpenCV objdetect plugins." ON) +if(${BR_WITH_OPENCV_OBJDETECT}) + set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} opencv_objdetect) + set(OPENCV_DEPENDENCIES ${OPENCV_DEPENDENCIES} opencv_objdetect) +else() + set(BR_EXCLUDED_PLUGINS ${BR_EXCLUDED_PLUGINS} plugins/imgproc/hog.cpp + plugins/metadata/cascade.cpp + plugins/metadata/hogpersondetector.cpp) +endif() + option(BR_WITH_OPENCV_PHOTO "Build with OpenCV photo plugins." ON) if(${BR_WITH_OPENCV_PHOTO}) set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} opencv_photo) -- libgit2 0.21.4