From f0d7222ba5a014adb8c8bb38d55cea27fb1819bf Mon Sep 17 00:00:00 2001
From: Josh Klontz <josh@rankone.io>
Date: Wed, 26 Aug 2015 12:40:48 -0400
Subject: [PATCH] decreased the required set of opencv libraries

---
 CMakeLists.txt                         |  2 +-
 openbr/plugins/cmake/opencv.cmake      | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 openbr/plugins/imgproc/custom_sift.cpp |  2 +-
 3 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 openbr/plugins/cmake/opencv.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e2000c..75b9cd4 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_features2d opencv_flann opencv_highgui opencv_imgproc opencv_ml opencv_nonfree opencv_objdetect opencv_photo opencv_video opencv_contrib)
+set(OPENCV_DEPENDENCIES opencv_core opencv_highgui opencv_imgproc opencv_ml opencv_objdetect)
 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
new file mode 100644
index 0000000..e6a0d08
--- /dev/null
+++ b/openbr/plugins/cmake/opencv.cmake
@@ -0,0 +1,53 @@
+option(BR_WITH_OPENCV_CONTRIB "Build with OpenCV contrib plugins." ON)
+if(${BR_WITH_OPENCV_CONTRIB})
+  set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} opencv_contrib)
+  set(OPENCV_DEPENDENCIES ${OPENCV_DEPENDENCIES} opencv_contrib)
+else()
+  set(BR_EXCLUDED_PLUGINS ${BR_EXCLUDED_PLUGINS} plugins/imgproc/heatmap.cpp
+                                                 plugins/imgproc/shapeaxisratio.cpp)
+endif()
+
+option(BR_WITH_OPENCV_FEATURES2D "Build with OpenCV features2d plugins." ON)
+if(${BR_WITH_OPENCV_FEATURES2D})
+  set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} opencv_features2d)
+  set(OPENCV_DEPENDENCIES ${OPENCV_DEPENDENCIES} opencv_features2d)
+else()
+  set(BR_EXCLUDED_PLUGINS ${BR_EXCLUDED_PLUGINS} plugins/distance/keypointmatcher.cpp
+                                                 plugins/imgproc/keypointdescriptor.cpp
+                                                 plugins/metadata/keypointdetector.cpp)
+endif()
+
+option(BR_WITH_OPENCV_FLANN "Build with OpenCV flann plugins." ON)
+if(${BR_WITH_OPENCV_FLANN})
+  set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} opencv_flann)
+  set(OPENCV_DEPENDENCIES ${OPENCV_DEPENDENCIES} opencv_flann)
+else()
+  set(BR_EXCLUDED_PLUGINS ${BR_EXCLUDED_PLUGINS} plugins/cluster/kmeans.cpp
+                                                 plugins/cluster/randomcentroids.cpp)
+endif()
+
+option(BR_WITH_OPENCV_NONFREE "Build with OpenCV nonfree plugins." ON)
+if(${BR_WITH_OPENCV_NONFREE})
+  set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} opencv_nonfree)
+  set(OPENCV_DEPENDENCIES ${OPENCV_DEPENDENCIES} opencv_nonfree)
+else()
+  set(BR_EXCLUDED_PLUGINS ${BR_EXCLUDED_PLUGINS} plugins/imgproc/custom_sift.cpp
+                                                 plugins/imgproc/sift.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)
+  set(OPENCV_DEPENDENCIES ${OPENCV_DEPENDENCIES} opencv_photo)
+else()
+  set(BR_EXCLUDED_PLUGINS ${BR_EXCLUDED_PLUGINS} plugins/imgproc/denoising.cpp
+                                                 plugins/imgproc/inpaint.cpp)
+endif()
+
+option(BR_WITH_OPENCV_VIDEO "Build with OpenCV video plugins." ON)
+if(${BR_WITH_OPENCV_VIDEO})
+  set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} opencv_video)
+  set(OPENCV_DEPENDENCIES ${OPENCV_DEPENDENCIES} opencv_video)
+else()
+  set(BR_EXCLUDED_PLUGINS ${BR_EXCLUDED_PLUGINS} plugins/imgproc/opticalflow.cpp)
+endif()
diff --git a/openbr/plugins/imgproc/custom_sift.cpp b/openbr/plugins/imgproc/custom_sift.cpp
index 128f2cd..429fa86 100644
--- a/openbr/plugins/imgproc/custom_sift.cpp
+++ b/openbr/plugins/imgproc/custom_sift.cpp
@@ -105,7 +105,7 @@
 #include <iostream>
 #include <stdarg.h>
 #include <opencv2/imgproc/imgproc.hpp>
-#include <opencv2/nonfree/features2d.hpp>
+#include <opencv2/nonfree/nonfree.hpp>
 
 using namespace cv;
 
--
libgit2 0.21.4