Peter M. Groen / openbr

Commit e18dadfca994ffa3ecb161a38906e9fd38a07c7b

Authored by Josh Klontz
1 parent 07212516

Introduced BR_WITH_OPENCV_OBJDETECT

Inline Side-by-side
Showing 2 changed files with 11 additions and 1 deletions
CMakeLists.txt
  View file @e18dadf
@@ -86,7 +86,7 @@ set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${Qt5Core_QTMAIN_LIBRARIES}) @@ -86,7 +86,7 @@ set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${Qt5Core_QTMAIN_LIBRARIES})
86 86
87 # Find OpenCV 87 # Find OpenCV
88 find_package(OpenCV 2.4.5 REQUIRED) 88 find_package(OpenCV 2.4.5 REQUIRED)
89 -set(OPENCV_DEPENDENCIES opencv_core opencv_highgui opencv_imgproc opencv_ml opencv_objdetect) 89 +set(OPENCV_DEPENDENCIES opencv_core opencv_highgui opencv_imgproc opencv_ml)
90 set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${OPENCV_DEPENDENCIES}) 90 set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${OPENCV_DEPENDENCIES})
91 91
92 # Find Alphanum 92 # Find Alphanum
openbr/plugins/cmake/opencv.cmake
  View file @e18dadf
@@ -35,6 +35,16 @@ else() @@ -35,6 +35,16 @@ else()
35 plugins/imgproc/sift.cpp) 35 plugins/imgproc/sift.cpp)
36 endif() 36 endif()
37 37
  38 +option(BR_WITH_OPENCV_OBJDETECT "Build with OpenCV objdetect plugins." ON)
  39 +if(${BR_WITH_OPENCV_OBJDETECT})
  40 + set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} opencv_objdetect)
  41 + set(OPENCV_DEPENDENCIES ${OPENCV_DEPENDENCIES} opencv_objdetect)
  42 +else()
  43 + set(BR_EXCLUDED_PLUGINS ${BR_EXCLUDED_PLUGINS} plugins/imgproc/hog.cpp
  44 + plugins/metadata/cascade.cpp
  45 + plugins/metadata/hogpersondetector.cpp)
  46 +endif()
  47 +
38 option(BR_WITH_OPENCV_PHOTO "Build with OpenCV photo plugins." ON) 48 option(BR_WITH_OPENCV_PHOTO "Build with OpenCV photo plugins." ON)
39 if(${BR_WITH_OPENCV_PHOTO}) 49 if(${BR_WITH_OPENCV_PHOTO})
40 set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} opencv_photo) 50 set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} opencv_photo)