From: Vadim Pisarevsky <no@email>
Date: Sat, 31 Mar 2012 17:25:19 +0000 (+0000)
Subject: added optional dependency stitching->nonfree. When nonfree is available, make sure... 
X-Git-Tag: accepted/2.0/20130307.220821~874
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5c615ec28f546c11321414ab7da354b752935a2c;p=profile%2Fivi%2Fopencv.git

added optional dependency stitching->nonfree. When nonfree is available, make sure linker does not throw it away.
---

diff --git a/modules/stitching/CMakeLists.txt b/modules/stitching/CMakeLists.txt
index 88fd865..5d48bd3 100644
--- a/modules/stitching/CMakeLists.txt
+++ b/modules/stitching/CMakeLists.txt
@@ -1,3 +1,3 @@
 set(the_description "Images stitching")
-ocv_define_module(stitching opencv_imgproc opencv_features2d opencv_calib3d opencv_objdetect OPTIONAL opencv_gpu)
+ocv_define_module(stitching opencv_imgproc opencv_features2d opencv_calib3d opencv_objdetect OPTIONAL opencv_gpu opencv_nonfree)
 
diff --git a/modules/stitching/src/matchers.cpp b/modules/stitching/src/matchers.cpp
index 1cc630e..9cfd343 100644
--- a/modules/stitching/src/matchers.cpp
+++ b/modules/stitching/src/matchers.cpp
@@ -50,6 +50,12 @@ using namespace cv::detail;
 using namespace cv::gpu;
 #endif
 
+#ifdef HAVE_OPENCV_NONFREE
+#include "opencv2/nonfree/nonfree.hpp"
+
+static bool makeUseOfNonfree = initModule_nonfree();
+#endif
+
 namespace {
 
 struct DistIdxPair